typedoc 0.24.0 → 0.24.2

package/dist/lib/models/types.js

@@ -681,7 +681,7 @@ class ReferenceType extends Type {
      * to a reflection. This happens for type parameters and when representing a mapped type.
      */
     isIntentionallyBroken() {
-        return this._target === -1;
+        return this._target === -1 || this.refersToTypeParameter;
     }
     /**
      * Convert this reference type to a declaration reference used for resolution of external types.
@@ -700,6 +700,12 @@ class ReferenceType extends Type {
     constructor(name, target, project, qualifiedName) {
         super();
         this.type = "reference";
+        /**
+         * If set, no warnings about something not being exported should be created
+         * since this may be referring to a type created with `infer X` which will not
+         * be registered on the project.
+         */
+        this.refersToTypeParameter = false;
         this.name = name;
         if (typeof target === "number") {
             this._target = target;
@@ -717,7 +723,9 @@ class ReferenceType extends Type {
         // Type parameters should never have resolved references because they
         // cannot be linked to, and might be declared within the type with conditional types.
         if (symbol.flags & ts.SymbolFlags.TypeParameter) {
-            return ReferenceType.createBrokenReference(name ?? symbol.name, context.project);
+            const ref = ReferenceType.createBrokenReference(name ?? symbol.name, context.project);
+            ref.refersToTypeParameter = true;
+            return ref;
         }
         const ref = new ReferenceType(name ?? symbol.name, new ReflectionSymbolId_1.ReflectionSymbolId(symbol), context.project, (0, tsutils_1.getQualifiedName)(symbol, name ?? symbol.name));
         const symbolPath = symbol?.declarations?.[0]
@@ -742,7 +750,12 @@ class ReferenceType extends Type {
         ref.package = (0, fs_1.findPackageForPath)(symbolPath);
         return ref;
     }
-    /** @internal this is used for type parameters, which don't actually point to something */
+    /**
+     * This is used for type parameters, which don't actually point to something,
+     * and also for temporary references which will be cleaned up with real references
+     * later during conversion.
+     * @internal
+     */
     static createBrokenReference(name, project) {
         return new ReferenceType(name, -1, project, name);
     }
@@ -775,6 +788,9 @@ class ReferenceType extends Type {
         if (this.name !== this.qualifiedName) {
             result.qualifiedName = this.qualifiedName;
         }
+        if (this.refersToTypeParameter) {
+            result.refersToTypeParameter = true;
+        }
         return result;
     }
     fromObject(de, obj) {
@@ -800,6 +816,7 @@ class ReferenceType extends Type {
         }
         this.qualifiedName = obj.qualifiedName ?? obj.name;
         this.package = obj.package;
+        this.refersToTypeParameter = !!obj.refersToTypeParameter;
     }
 }
 exports.ReferenceType = ReferenceType;

package/dist/lib/output/themes/MarkedPlugin.js

@@ -37,6 +37,7 @@ const components_1 = require("../components");
 const events_1 = require("../events");
 const utils_1 = require("../../utils");
 const highlighter_1 = require("../../utils/highlighter");
+const html_1 = require("../../utils/html");
 /**
  * Implements markdown and relativeURL helpers for templates.
  * @internal
@@ -166,11 +167,11 @@ output file :
                 const slug = slugger.slug(text);
                 // Prefix the slug with an extra `$` to prevent conflicts with TypeDoc's anchors.
                 this.page.pageHeadings.push({
-                    link: `#$${slug}`,
-                    text,
+                    link: `#md:${slug}`,
+                    text: (0, html_1.getTextContent)(text),
                     level,
                 });
-                return `<a id="$${slug}" class="tsd-anchor"></a><h${level}><a href="#$${slug}" style="color:inherit;text-decoration:none">${text}</a></h${level}>`;
+                return `<a id="md:${slug}" class="tsd-anchor"></a><h${level}><a href="#$${slug}" style="color:inherit;text-decoration:none">${text}</a></h${level}>`;
             };
         }
         markedOptions.mangle ?? (markedOptions.mangle = false); // See https://github.com/TypeStrong/typedoc/issues/1395

package/dist/lib/output/themes/default/DefaultTheme.js

@@ -6,6 +6,7 @@ const models_1 = require("../../../models");
 const UrlMapping_1 = require("../../models/UrlMapping");
 const DefaultThemeRenderContext_1 = require("./DefaultThemeRenderContext");
 const utils_1 = require("../../../utils");
+const lib_1 = require("../lib");
 /**
  * Default theme implementation of TypeDoc. If a theme does not provide a custom
  * {@link Theme} implementation, this theme class will be used.
@@ -194,15 +195,8 @@ exports.DefaultTheme = DefaultTheme;
 function hasReadme(readme) {
     return !readme.endsWith("none");
 }
-function toStyleClass(str) {
-    return str.replace(/(\w)([A-Z])/g, (_m, m1, m2) => m1 + "-" + m2).toLowerCase();
-}
 function getReflectionClasses(reflection, filters) {
     const classes = [];
-    classes.push(toStyleClass("tsd-kind-" + models_1.ReflectionKind[reflection.kind]));
-    if (reflection.parent && reflection.parent instanceof models_1.DeclarationReflection) {
-        classes.push(toStyleClass(`tsd-parent-kind-${models_1.ReflectionKind[reflection.parent.kind]}`));
-    }
     // Filter classes should match up with the settings function in
     // partials/navigation.tsx.
     for (const key of Object.keys(filters)) {
@@ -229,12 +223,12 @@ function getReflectionClasses(reflection, filters) {
         else if (key.startsWith("@")) {
             if (key === "@deprecated") {
                 if (reflection.isDeprecated()) {
-                    classes.push(toStyleClass(`tsd-is-${key.substring(1)}`));
+                    classes.push((0, lib_1.toStyleClass)(`tsd-is-${key.substring(1)}`));
                 }
             }
             else if (reflection.comment?.hasModifier(key) ||
                 reflection.comment?.getTag(key)) {
-                classes.push(toStyleClass(`tsd-is-${key.substring(1)}`));
+                classes.push((0, lib_1.toStyleClass)(`tsd-is-${key.substring(1)}`));
             }
         }
     }

package/dist/lib/output/themes/default/layouts/default.js

@@ -17,7 +17,7 @@ const defaultLayout = (context, template, props) => (utils_1.JSX.createElement("
         utils_1.JSX.createElement("link", { rel: "stylesheet", href: context.relativeURL("assets/highlight.css", true) }),
         context.options.getValue("customCss") && (utils_1.JSX.createElement("link", { rel: "stylesheet", href: context.relativeURL("assets/custom.css", true) })),
         utils_1.JSX.createElement("script", { defer: true, src: context.relativeURL("assets/main.js", true) }),
-        utils_1.JSX.createElement("script", { async: true, src: context.relativeURL("assets/search.js", true), id: "search-script" }),
+        utils_1.JSX.createElement("script", { async: true, src: context.relativeURL("assets/search.js", true), id: "tsd-search-script" }),
         context.hook("head.end")),
     utils_1.JSX.createElement("body", null,
         context.hook("body.begin"),

package/dist/lib/output/themes/default/partials/icon.js

@@ -66,7 +66,7 @@ exports.icons = {
     [models_1.ReflectionKind.SetSignature]() {
         return this[models_1.ReflectionKind.Accessor]();
     },
-    [models_1.ReflectionKind.TypeAlias]: () => kindIcon(models_1.ReflectionKind.TypeAlias, utils_1.JSX.createElement("path", { d: "M11.31 16V8.224H8.91V7.24H14.79V8.224H12.39V16H11.31Z", fill: "var(--color-text)" }), "var(--color-ts)"),
+    [models_1.ReflectionKind.TypeAlias]: () => kindIcon(models_1.ReflectionKind.TypeAlias, utils_1.JSX.createElement("path", { d: "M11.31 16V8.224H8.91V7.24H14.79V8.224H12.39V16H11.31Z", fill: "var(--color-text)" }), "var(--color-ts-type-alias)"),
     [models_1.ReflectionKind.TypeLiteral]() {
         return this[models_1.ReflectionKind.TypeAlias]();
     },

package/dist/lib/output/themes/default/partials/member.declaration.js

@@ -6,7 +6,7 @@ const utils_1 = require("../../../../utils");
 const lib_1 = require("../../lib");
 const memberDeclaration = (context, props) => (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
     utils_1.JSX.createElement("div", { class: "tsd-signature" },
-        (0, lib_1.wbr)(props.name),
+        utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(props) }, (0, lib_1.wbr)(props.name)),
         (0, lib_1.renderTypeParametersSignature)(props.typeParameters),
         props.type && (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
             utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" },

package/dist/lib/output/themes/default/partials/member.signature.body.js

@@ -14,7 +14,7 @@ const memberSignatureBody = (context, props, { hideSources = false } = {}) => (u
             utils_1.JSX.createElement("h5", null,
                 (0, lib_1.renderFlags)(item.flags, item.comment),
                 !!item.flags.isRest && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "..."),
-                item.name,
+                utils_1.JSX.createElement("span", { class: "tsd-kind-parameter" }, item.name),
                 ": ",
                 context.type(item.type),
                 item.defaultValue != null && (utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" },

package/dist/lib/output/themes/default/partials/member.signature.title.d.ts

@@ -1,7 +1,7 @@
 import type { DefaultThemeRenderContext } from "../DefaultThemeRenderContext";
 import { JSX } from "../../../../utils";
 import { SignatureReflection } from "../../../../models";
-export declare const memberSignatureTitle: (context: DefaultThemeRenderContext, props: SignatureReflection, { hideName, arrowStyle }?: {
-    hideName?: boolean | undefined;
-    arrowStyle?: boolean | undefined;
-}) => JSX.Element;
+export declare function memberSignatureTitle(context: DefaultThemeRenderContext, props: SignatureReflection, { hideName, arrowStyle }?: {
+    hideName?: boolean;
+    arrowStyle?: boolean;
+}): JSX.Element;

package/dist/lib/output/themes/default/partials/member.signature.title.js

@@ -4,22 +4,35 @@ exports.memberSignatureTitle = void 0;
 const lib_1 = require("../../lib");
 const utils_1 = require("../../../../utils");
 const models_1 = require("../../../../models");
-const memberSignatureTitle = (context, props, { hideName = false, arrowStyle = false } = {}) => (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
-    !hideName ? ((0, lib_1.wbr)(props.name)) : (utils_1.JSX.createElement(utils_1.JSX.Fragment, null, props.kind === models_1.ReflectionKind.ConstructorSignature && (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
-        !!props.flags.isAbstract && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "abstract "),
-        utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "new "))))),
-    (0, lib_1.renderTypeParametersSignature)(props.typeParameters),
-    utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "("),
-    (0, lib_1.join)(", ", props.parameters ?? [], (item) => (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
+function renderParameterWithType(context, item) {
+    return (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
         !!item.flags.isRest && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "..."),
-        item.name,
+        utils_1.JSX.createElement("span", { class: "tsd-kind-parameter" }, item.name),
         utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" },
             !!item.flags.isOptional && "?",
             !!item.defaultValue && "?",
             ": "),
-        context.type(item.type)))),
-    utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, ")"),
-    !!props.type && (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
-        utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, arrowStyle ? " => " : ": "),
-        context.type(props.type)))));
+        context.type(item.type)));
+}
+function renderParameterWithoutType(item) {
+    return (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
+        !!item.flags.isRest && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "..."),
+        utils_1.JSX.createElement("span", { class: "tsd-kind-parameter" }, item.name),
+        (item.flags.isOptional || item.defaultValue) && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "?")));
+}
+function memberSignatureTitle(context, props, { hideName = false, arrowStyle = false } = {}) {
+    const hideParamTypes = context.options.getValue("hideParameterTypesInTitle");
+    const renderParam = hideParamTypes ? renderParameterWithoutType : renderParameterWithType.bind(null, context);
+    return (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
+        !hideName ? (utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(props) }, (0, lib_1.wbr)(props.name))) : (utils_1.JSX.createElement(utils_1.JSX.Fragment, null, props.kind === models_1.ReflectionKind.ConstructorSignature && (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
+            !!props.flags.isAbstract && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "abstract "),
+            utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "new "))))),
+        (0, lib_1.renderTypeParametersSignature)(props.typeParameters),
+        utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "("),
+        (0, lib_1.join)(", ", props.parameters ?? [], renderParam),
+        utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, ")"),
+        !!props.type && (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
+            utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, arrowStyle ? " => " : ": "),
+            context.type(props.type)))));
+}
 exports.memberSignatureTitle = memberSignatureTitle;

package/dist/lib/output/themes/default/partials/navigation.js

@@ -56,7 +56,7 @@ function settings(context) {
                         utils_1.JSX.createElement("ul", { id: "tsd-filter-options" }, ...visibilityOptions)))),
                 utils_1.JSX.createElement("div", { class: "tsd-theme-toggle" },
                     utils_1.JSX.createElement("h4", { class: "uppercase" }, "Theme"),
-                    utils_1.JSX.createElement("select", { id: "theme" },
+                    utils_1.JSX.createElement("select", { id: "tsd-theme" },
                         utils_1.JSX.createElement("option", { value: "os" }, "OS"),
                         utils_1.JSX.createElement("option", { value: "light" }, "Light"),
                         utils_1.JSX.createElement("option", { value: "dark" }, "Dark")))))));

package/dist/lib/output/themes/default/partials/parameter.js

@@ -20,7 +20,7 @@ const parameter = (context, props) => (utils_1.JSX.createElement(utils_1.JSX.Fra
                     utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "["),
                     props.indexSignature?.parameters?.map((item) => (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
                         !!item.flags.isRest && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "..."),
-                        item.name,
+                        utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(item) }, item.name),
                         ": ",
                         context.type(item.type)))),
                     utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "]: "),
@@ -31,7 +31,7 @@ const parameter = (context, props) => (utils_1.JSX.createElement(utils_1.JSX.Fra
         props.children?.map((item) => (utils_1.JSX.createElement(utils_1.JSX.Fragment, null, item.signatures ? (utils_1.JSX.createElement("li", { class: "tsd-parameter" },
             utils_1.JSX.createElement("h5", null,
                 !!item.flags.isRest && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "..."),
-                (0, lib_1.wbr)(item.name),
+                utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(item) }, (0, lib_1.wbr)(item.name)),
                 utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" },
                     !!item.flags.isOptional && "?",
                     ":"),
@@ -41,7 +41,7 @@ const parameter = (context, props) => (utils_1.JSX.createElement(utils_1.JSX.Fra
                 utils_1.JSX.createElement("h5", null,
                     (0, lib_1.renderFlags)(item.flags, item.comment),
                     !!item.flags.isRest && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "..."),
-                    (0, lib_1.wbr)(item.name),
+                    utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(item) }, (0, lib_1.wbr)(item.name)),
                     utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" },
                         !!item.flags.isOptional && "?",
                         ": "),
@@ -54,7 +54,7 @@ const parameter = (context, props) => (utils_1.JSX.createElement(utils_1.JSX.Fra
                     utils_1.JSX.createElement("h5", null,
                         (0, lib_1.renderFlags)(item.getSignature.flags, item.getSignature.comment),
                         utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "get "),
-                        (0, lib_1.wbr)(item.name),
+                        utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(item) }, (0, lib_1.wbr)(item.name)),
                         utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "(): "),
                         context.type(item.getSignature.type)),
                     context.comment(item.getSignature)))),
@@ -63,7 +63,7 @@ const parameter = (context, props) => (utils_1.JSX.createElement(utils_1.JSX.Fra
                     utils_1.JSX.createElement("h5", null,
                         (0, lib_1.renderFlags)(item.setSignature.flags, item.setSignature.comment),
                         utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "set "),
-                        (0, lib_1.wbr)(item.name),
+                        utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(item) }, (0, lib_1.wbr)(item.name)),
                         utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "("),
                         item.setSignature.parameters?.map((item) => (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
                             item.name,

package/dist/lib/output/themes/default/partials/type.js

@@ -50,7 +50,7 @@ function getNamespacedPath(reflection) {
     return path;
 }
 function renderUniquePath(context, reflection) {
-    return (0, lib_1.join)(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "."), getUniquePath(reflection), (item) => (utils_1.JSX.createElement("a", { href: context.urlTo(item), class: "tsd-signature-type", "data-tsd-kind": models_1.ReflectionKind.singularString(item.kind) }, item.name)));
+    return (0, lib_1.join)(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "."), getUniquePath(reflection), (item) => (utils_1.JSX.createElement("a", { href: context.urlTo(item), class: "tsd-signature-type " + (0, lib_1.getKindClass)(item) }, item.name)));
 }
 let indentationDepth = 0;
 function includeIndentation() {
@@ -71,14 +71,22 @@ const typeRenderers = {
             utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "[]")));
     },
     conditional(context, type) {
-        return (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
+        indentationDepth++;
+        const parts = [
             renderType(context, type.checkType, models_1.TypeContext.conditionalCheck),
             utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, " extends "),
             renderType(context, type.extendsType, models_1.TypeContext.conditionalExtends),
-            utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, " ? "),
+            utils_1.JSX.createElement("br", null),
+            includeIndentation(),
+            utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "? "),
             renderType(context, type.trueType, models_1.TypeContext.conditionalTrue),
-            utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, " : "),
-            renderType(context, type.falseType, models_1.TypeContext.conditionalFalse)));
+            utils_1.JSX.createElement("br", null),
+            includeIndentation(),
+            utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, ": "),
+            renderType(context, type.falseType, models_1.TypeContext.conditionalFalse),
+        ];
+        indentationDepth--;
+        return utils_1.JSX.createElement(utils_1.JSX.Fragment, null, parts);
     },
     indexedAccess(context, type) {
         let indexType = renderType(context, type.indexType, models_1.TypeContext.indexedIndex);
@@ -101,7 +109,7 @@ const typeRenderers = {
         return (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
             utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "infer "),
             " ",
-            type.name,
+            utils_1.JSX.createElement("span", { class: "tsd-kind-type-parameter" }, type.name),
             type.constraint && (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
                 utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, " extends "),
                 renderType(context, type.constraint, models_1.TypeContext.inferredConstraint)))));
@@ -116,36 +124,37 @@ const typeRenderers = {
         return utils_1.JSX.createElement("span", { class: "tsd-signature-type" }, (0, lib_1.stringify)(type.value));
     },
     mapped(context, type) {
-        const children = [];
+        indentationDepth++;
+        const parts = [utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "{"), utils_1.JSX.createElement("br", null), includeIndentation()];
         switch (type.readonlyModifier) {
             case "+":
-                children.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "readonly "));
+                parts.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "readonly "));
                 break;
             case "-":
-                children.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "-readonly "));
+                parts.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "-readonly "));
                 break;
         }
-        children.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "[ "), utils_1.JSX.createElement("span", { class: "tsd-signature-type" }, type.parameter), utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, " in "), renderType(context, type.parameterType, models_1.TypeContext.mappedParameter));
+        parts.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "["), utils_1.JSX.createElement("span", { class: "tsd-kind-type-parameter" }, type.parameter), utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, " in "), renderType(context, type.parameterType, models_1.TypeContext.mappedParameter));
         if (type.nameType) {
-            children.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, " as "), renderType(context, type.nameType, models_1.TypeContext.mappedName));
+            parts.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, " as "), renderType(context, type.nameType, models_1.TypeContext.mappedName));
         }
-        children.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "]"));
+        parts.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "]"));
         switch (type.optionalModifier) {
             case "+":
-                children.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "?: "));
+                parts.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "?: "));
                 break;
             case "-":
-                children.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "-?: "));
+                parts.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "-?: "));
                 break;
             default:
-                children.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, ": "));
+                parts.push(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, ": "));
         }
-        children.push(renderType(context, type.templateType, models_1.TypeContext.mappedTemplate));
+        parts.push(renderType(context, type.templateType, models_1.TypeContext.mappedTemplate));
+        indentationDepth--;
         return (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
-            utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "{"),
-            " ",
-            children,
-            " ",
+            parts,
+            utils_1.JSX.createElement("br", null),
+            includeIndentation(),
             utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "}")));
     },
     namedTupleMember(context, type) {
@@ -177,8 +186,8 @@ const typeRenderers = {
         let name;
         if (reflection) {
             if (reflection.kindOf(models_1.ReflectionKind.TypeParameter)) {
-                // Don't generate a link will always point to this page, but do set the kind.
-                name = (utils_1.JSX.createElement("span", { class: "tsd-signature-type", "data-tsd-kind": models_1.ReflectionKind.singularString(reflection.kind) }, reflection.name));
+                // Don't generate a link as it will always point to this page.
+                name = utils_1.JSX.createElement("span", { class: "tsd-signature-type tsd-kind-type-parameter" }, reflection.name);
             }
             else {
                 name = renderUniquePath(context, reflection);
@@ -187,8 +196,11 @@ const typeRenderers = {
         else if (type.externalUrl) {
             name = (utils_1.JSX.createElement("a", { href: type.externalUrl, class: "tsd-signature-type external", target: "_blank" }, type.name));
         }
+        else if (type.refersToTypeParameter) {
+            name = utils_1.JSX.createElement("span", { class: "tsd-signature-type tsd-kind-type-parameter" }, type.name);
+        }
         else {
-            name = utils_1.JSX.createElement("span", { class: "tsd-signature-type" }, type.name);
+            name = utils_1.JSX.createElement("span", { class: "tsd-signature-type " }, type.name);
         }
         if (type.typeArguments?.length) {
             return (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
@@ -206,7 +218,7 @@ const typeRenderers = {
         for (const item of children) {
             if (item.getSignature && item.setSignature) {
                 members.push(utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
-                    item.name,
+                    utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(item) }, item.name),
                     utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, ": "),
                     renderType(context, item.getSignature.type, models_1.TypeContext.none)));
                 continue;
@@ -214,7 +226,7 @@ const typeRenderers = {
             if (item.getSignature) {
                 members.push(utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
                     utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "get "),
-                    item.name,
+                    utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(item.getSignature) }, item.name),
                     utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "(): "),
                     renderType(context, item.getSignature.type, models_1.TypeContext.none)));
                 continue;
@@ -222,7 +234,7 @@ const typeRenderers = {
             if (item.setSignature) {
                 members.push(utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
                     utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "set "),
-                    item.name,
+                    utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(item.setSignature) }, item.name),
                     utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "("),
                     item.setSignature.parameters?.map((item) => (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
                         item.name,
@@ -234,17 +246,17 @@ const typeRenderers = {
             if (item.signatures) {
                 for (const sig of item.signatures) {
                     members.push(utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
-                        item.name,
+                        utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(sig) }, item.name),
                         item.flags.isOptional && utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, "?"),
                         context.memberSignatureTitle(sig, {
                             hideName: true,
-                            arrowStyle: false,
+                            arrowStyle: true,
                         })));
                 }
                 continue;
             }
             members.push(utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
-                item.name,
+                utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(item) }, item.name),
                 utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, item.flags.isOptional ? "?: " : ": "),
                 renderType(context, item.type, models_1.TypeContext.none)));
         }
@@ -252,8 +264,9 @@ const typeRenderers = {
             const index = type.declaration.indexSignature;
             members.push(utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
                 "[",
-                index.parameters[0].name,
-                ": ",
+                utils_1.JSX.createElement("span", { class: (0, lib_1.getKindClass)(type.declaration.indexSignature) }, index.parameters[0].name),
+                ":",
+                " ",
                 renderType(context, index.parameters[0].type, models_1.TypeContext.none),
                 "]",
                 utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, ": "),

package/dist/lib/output/themes/default/partials/typeParameters.js

@@ -10,7 +10,7 @@ function typeParameters(context, typeParameters) {
                 utils_1.JSX.createElement("h4", null,
                     item.flags.isConst && "const ",
                     item.varianceModifier ? `${item.varianceModifier} ` : "",
-                    item.name,
+                    utils_1.JSX.createElement("span", { class: "tsd-kind-type-parameter" }, item.name),
                     !!item.type && (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
                         utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, " extends "),
                         context.type(item.type))),

package/dist/lib/output/themes/lib.d.ts

@@ -2,6 +2,8 @@ import { Comment, Reflection, ReflectionFlags, TypeParameterReflection } from ".
 import { JSX } from "../../utils";
 export declare function stringify(data: unknown): string;
 export declare function getDisplayName(refl: Reflection): string;
+export declare function toStyleClass(str: string): string;
+export declare function getKindClass(refl: Reflection): string;
 /**
  * Insert word break tags ``<wbr>`` into the given string.
  *

package/dist/lib/output/themes/lib.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderName = exports.camelToTitleCase = exports.renderTypeParametersSignature = exports.hasTypeParameters = exports.classNames = exports.renderFlags = exports.join = exports.wbr = exports.getDisplayName = exports.stringify = void 0;
+exports.renderName = exports.camelToTitleCase = exports.renderTypeParametersSignature = exports.hasTypeParameters = exports.classNames = exports.renderFlags = exports.join = exports.wbr = exports.getKindClass = exports.toStyleClass = exports.getDisplayName = exports.stringify = void 0;
 const models_1 = require("../../models");
 const utils_1 = require("../../utils");
 function stringify(data) {
@@ -18,6 +18,17 @@ function getDisplayName(refl) {
     return `${refl.name}${version}`;
 }
 exports.getDisplayName = getDisplayName;
+function toStyleClass(str) {
+    return str.replace(/(\w)([A-Z])/g, (_m, m1, m2) => m1 + "-" + m2).toLowerCase();
+}
+exports.toStyleClass = toStyleClass;
+function getKindClass(refl) {
+    if (refl instanceof models_1.ReferenceReflection) {
+        return getKindClass(refl.getTargetReflectionDeep());
+    }
+    return models_1.ReflectionKind.classString(refl.kind);
+}
+exports.getKindClass = getKindClass;
 /**
  * Insert word break tags ``<wbr>`` into the given string.
  *
@@ -83,7 +94,7 @@ function renderTypeParametersSignature(typeParameters) {
         join(utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, ", "), typeParameters, (item) => (utils_1.JSX.createElement(utils_1.JSX.Fragment, null,
             item.flags.isConst && "const ",
             item.varianceModifier ? `${item.varianceModifier} ` : "",
-            utils_1.JSX.createElement("span", { class: "tsd-signature-type", "data-tsd-kind": models_1.ReflectionKind.singularString(item.kind) }, item.name)))),
+            utils_1.JSX.createElement("span", { class: "tsd-signature-type tsd-kind-type-parameter" }, item.name)))),
         utils_1.JSX.createElement("span", { class: "tsd-signature-symbol" }, ">")))));
 }
 exports.renderTypeParametersSignature = renderTypeParametersSignature;

package/dist/lib/serialization/schema.d.ts

@@ -26,7 +26,6 @@
  *
  * For documentation on the JSON output properties, view the corresponding model.
  * @module
- * @internal
  */
 import type * as M from "../models";
 /**
@@ -130,6 +129,7 @@ export interface QueryType extends Type, S<M.QueryType, "type" | "queryType"> {
 export interface ReferenceType extends Type, S<M.ReferenceType, "type" | "name" | "typeArguments" | "package" | "externalUrl"> {
     target: number | ReflectionSymbolId;
     qualifiedName?: string;
+    refersToTypeParameter?: boolean;
 }
 export interface ReflectionType extends Type, S<M.ReflectionType, "type" | "declaration"> {
 }

package/dist/lib/serialization/schema.js

@@ -27,6 +27,5 @@
  *
  * For documentation on the JSON output properties, view the corresponding model.
  * @module
- * @internal
  */
 Object.defineProperty(exports, "__esModule", { value: true });

package/dist/lib/utils/entry-point.js

@@ -34,7 +34,6 @@ const Path = __importStar(require("path"));
 const package_manifest_1 = require("./package-manifest");
 const paths_1 = require("./paths");
 const fs_1 = require("./fs");
-const array_1 = require("./array");
 const general_1 = require("./general");
 /**
  * Defines how entry points are interpreted.
@@ -120,23 +119,23 @@ function getWatchEntryPoints(logger, options, program) {
 exports.getWatchEntryPoints = getWatchEntryPoints;
 function getPackageDirectories(logger, options, packageGlobPaths) {
     const exclude = (0, paths_1.createMinimatch)(options.getValue("exclude"));
-    const rootDir = deriveRootDir(packageGlobPaths);
+    const rootDir = (0, fs_1.deriveRootDir)(packageGlobPaths);
     // packages arguments are workspace tree roots, or glob patterns
     // This expands them to leave only leaf packages
     return (0, package_manifest_1.expandPackages)(logger, rootDir, packageGlobPaths, exclude);
 }
 exports.getPackageDirectories = getPackageDirectories;
 function getModuleName(fileName, baseDir) {
-    return (0, fs_1.normalizePath)((0, path_1.relative)(baseDir, fileName)).replace(/(\/index)?(\.d)?\.([cm][tj]s|[tj]sx?)$/, "");
+    return (0, paths_1.normalizePath)((0, path_1.relative)(baseDir, fileName)).replace(/(\/index)?(\.d)?\.([cm][tj]s|[tj]sx?)$/, "");
 }
 /**
  * Converts a list of file-oriented paths in to DocumentationEntryPoints for conversion.
  * This is in contrast with the package-oriented `getEntryPointsForPackages`
  */
 function getEntryPointsForPaths(logger, inputFiles, options, programs = getEntryPrograms(logger, options)) {
-    const baseDir = options.getValue("basePath") || (0, fs_1.getCommonDirectory)(inputFiles);
+    const baseDir = options.getValue("basePath") || (0, fs_1.deriveRootDir)(inputFiles);
     const entryPoints = [];
-    entryLoop: for (const fileOrDir of inputFiles.map(fs_1.normalizePath)) {
+    entryLoop: for (const fileOrDir of inputFiles.map(paths_1.normalizePath)) {
         const toCheck = [fileOrDir];
         if (!/\.([cm][tj]s|[tj]sx?)$/.test(fileOrDir)) {
             toCheck.push(`${fileOrDir}/index.ts`, `${fileOrDir}/index.cts`, `${fileOrDir}/index.mts`, `${fileOrDir}/index.tsx`, `${fileOrDir}/index.js`, `${fileOrDir}/index.cjs`, `${fileOrDir}/index.mjs`, `${fileOrDir}/index.jsx`);
@@ -163,7 +162,7 @@ function getExpandedEntryPointsForPaths(logger, inputFiles, options, programs =
 }
 exports.getExpandedEntryPointsForPaths = getExpandedEntryPointsForPaths;
 function expandGlobs(inputFiles) {
-    const base = (0, fs_1.getCommonDirectory)(inputFiles);
+    const base = (0, fs_1.deriveRootDir)(inputFiles);
     const result = inputFiles.flatMap((entry) => (0, fs_1.glob)(entry, base, { includeDirectories: true, followSymlinks: true }));
     return result;
 }
@@ -230,7 +229,7 @@ function expandInputFiles(logger, entryPoints, options) {
             if (!entryPoint && (0, paths_1.matchesAny)(exclude, file)) {
                 return;
             }
-            files.push((0, fs_1.normalizePath)(file));
+            files.push((0, paths_1.normalizePath)(file));
         }
     }
     entryPoints.forEach((file) => {
@@ -243,15 +242,6 @@ function expandInputFiles(logger, entryPoints, options) {
     });
     return files;
 }
-function deriveRootDir(packageGlobPaths) {
-    const globs = (0, paths_1.createMinimatch)(packageGlobPaths);
-    const rootPaths = globs.flatMap((glob) => (0, array_1.filterMap)(glob.set, (set) => {
-        const stop = set.findIndex((part) => typeof part !== "string");
-        const path = stop === -1 ? set : set.slice(0, stop);
-        return `/${path.join("/")}`;
-    }));
-    return (0, fs_1.getCommonDirectory)(rootPaths);
-}
 /**
  * Expand the provided packages configuration paths, determining the entry points
  * and creating the ts.Programs for any which are found.