diff --git a/CHANGELOG.md b/CHANGELOG.md index c521ee51c..50948d535 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Features +- Type parameters on functions/classes can will now link to the "Type Parameters" section, #2322. + Type parameters have also been changed to have a distinct color from type aliases when rendering, which can be changed with custom CSS. - TypeDoc now provides warnings if a signature comment is directly specified on a signature and contains `@param` tags which do not apply, #2368. - Extended reflection preview view for interfaces to include type parameters, #2455. - Added special cases for converting methods which are documented as returning `this` or accepting `this` as a parameter, #2458. diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index 25659b488..63beb4be4 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -308,9 +308,6 @@ export class Context { ); } - /** - * @param callback The callback function that should be executed with the changed context. - */ public withScope(scope: Reflection): Context { const context = new Context( this.converter, diff --git a/src/lib/converter/converter.ts b/src/lib/converter/converter.ts index 0f792cb62..445f3880c 100644 --- a/src/lib/converter/converter.ts +++ b/src/lib/converter/converter.ts @@ -254,7 +254,6 @@ export class Converter extends ChildableComponent< * Convert the given TypeScript type into its TypeDoc type reflection. * * @param context The context object describing the current state the converter is in. - * @param referenceTarget The target to be used to attempt to resolve reference types * @returns The TypeDoc type reflection representing the given node and type. * @internal */ diff --git a/src/lib/models/comments/comment.ts b/src/lib/models/comments/comment.ts index dc3aab4ee..abefe74dd 100644 --- a/src/lib/models/comments/comment.ts +++ b/src/lib/models/comments/comment.ts @@ -387,7 +387,6 @@ export class Comment { * Return the first tag with the given name. * * @param tagName The name of the tag to look for. - * @param paramName An optional parameter name to look for. * @returns The found tag or undefined. */ getTag(tagName: `@${string}`): CommentTag | undefined { diff --git a/src/lib/models/reflections/abstract.ts b/src/lib/models/reflections/abstract.ts index 10d677773..b7f582a86 100644 --- a/src/lib/models/reflections/abstract.ts +++ b/src/lib/models/reflections/abstract.ts @@ -440,7 +440,7 @@ export abstract class Reflection { /** * Return a child by its name. * - * @param names The name hierarchy of the child to look for. + * @param arg The name hierarchy of the child to look for. * @returns The found child or undefined. */ getChildByName(arg: string | string[]): Reflection | undefined { diff --git a/src/lib/models/types.ts b/src/lib/models/types.ts index 5d425a9fa..be49d3a91 100644 --- a/src/lib/models/types.ts +++ b/src/lib/models/types.ts @@ -912,23 +912,15 @@ export class ReferenceType extends Type { context: Context, name?: string, ) { - // 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) { - const ref = ReferenceType.createBrokenReference( - name ?? symbol.name, - context.project, - ); - ref.refersToTypeParameter = true; - return ref; - } - const ref = new ReferenceType( name ?? symbol.name, new ReflectionSymbolId(symbol), context.project, getQualifiedName(symbol, name ?? symbol.name), ); + ref.refersToTypeParameter = !!( + symbol.flags & ts.SymbolFlags.TypeParameter + ); const symbolPath = symbol?.declarations?.[0] ?.getSourceFile() diff --git a/src/lib/output/themes/default/DefaultTheme.tsx b/src/lib/output/themes/default/DefaultTheme.tsx index 9b5a2ac24..da0b6754a 100644 --- a/src/lib/output/themes/default/DefaultTheme.tsx +++ b/src/lib/output/themes/default/DefaultTheme.tsx @@ -9,6 +9,7 @@ import { SignatureReflection, ReflectionCategory, ReflectionGroup, + TypeParameterReflection, } from "../../../models"; import { RenderTemplate, UrlMapping } from "../../models/UrlMapping"; import type { PageEvent } from "../../events"; @@ -121,7 +122,6 @@ export class DefaultTheme extends Theme { * Create a new DefaultTheme instance. * * @param renderer The renderer this theme is attached to. - * @param basePath The base path of this theme. */ constructor(renderer: Renderer) { super(renderer); @@ -336,7 +336,11 @@ export class DefaultTheme extends Theme { * @param container The nearest reflection having an own document. */ static applyAnchorUrl(reflection: Reflection, container: Reflection) { - if (!(reflection instanceof DeclarationReflection) && !(reflection instanceof SignatureReflection)) { + if ( + !(reflection instanceof DeclarationReflection) && + !(reflection instanceof SignatureReflection) && + !(reflection instanceof TypeParameterReflection) + ) { return; } diff --git a/src/lib/output/themes/default/partials/type.tsx b/src/lib/output/themes/default/partials/type.tsx index 9794c44a8..c6b7d4fe5 100644 --- a/src/lib/output/themes/default/partials/type.tsx +++ b/src/lib/output/themes/default/partials/type.tsx @@ -276,8 +276,11 @@ const typeRenderers: { if (reflection) { if (reflection.kindOf(ReflectionKind.TypeParameter)) { - // Don't generate a link as it will always point to this page. - name = {reflection.name}; + name = ( + + {reflection.name} + + ); } else { name = renderUniquePath(context, reflection); } @@ -290,7 +293,7 @@ const typeRenderers: { } else if (type.refersToTypeParameter) { name = {type.name}; } else { - name = {type.name}; + name = {type.name}; } if (type.typeArguments?.length) { diff --git a/src/lib/output/themes/default/partials/typeParameters.tsx b/src/lib/output/themes/default/partials/typeParameters.tsx index 1da7df539..3b663d00c 100644 --- a/src/lib/output/themes/default/partials/typeParameters.tsx +++ b/src/lib/output/themes/default/partials/typeParameters.tsx @@ -11,8 +11,11 @@ export function typeParameters(context: DefaultThemeRenderContext, typeParameter {typeParameters?.map((item) => (

  • - {item.flags.isConst && "const "} - {item.varianceModifier ? `${item.varianceModifier} ` : ""} + + {item.flags.isConst && const } + {item.varianceModifier && ( + {item.varianceModifier} + )} {item.name} {!!item.type && ( <> diff --git a/src/lib/output/themes/lib.tsx b/src/lib/output/themes/lib.tsx index 1d2c4ae0a..ec7dbb12a 100644 --- a/src/lib/output/themes/lib.tsx +++ b/src/lib/output/themes/lib.tsx @@ -108,7 +108,9 @@ export function renderTypeParametersSignature( <> {item.flags.isConst && const } {item.varianceModifier ? `${item.varianceModifier} ` : ""} - {item.name} + + {item.name} + ))} {">"} diff --git a/src/lib/serialization/serializer.ts b/src/lib/serialization/serializer.ts index fb08b2372..9b4998a0f 100644 --- a/src/lib/serialization/serializer.ts +++ b/src/lib/serialization/serializer.ts @@ -64,7 +64,6 @@ export class Serializer extends EventDispatcher { /** * Same as toObject but emits {@link Serializer.EVENT_BEGIN} and {@link Serializer.EVENT_END} events. * @param value - * @param eventData Partial information to set in the event */ projectToObject( value: ProjectReflection, diff --git a/src/lib/utils/loggers.ts b/src/lib/utils/loggers.ts index 8e43de98b..9a6cabfea 100644 --- a/src/lib/utils/loggers.ts +++ b/src/lib/utils/loggers.ts @@ -100,7 +100,6 @@ export class Logger { * Log the given verbose message. * * @param text The message that should be logged. - * @param args The arguments that should be printed into the given message. */ verbose(text: string) { this.log(this.addContext(text, LogLevel.Verbose), LogLevel.Verbose); @@ -115,7 +114,6 @@ export class Logger { * Log the given warning. * * @param text The warning that should be logged. - * @param args The arguments that should be printed into the given warning. */ warn(text: string, node?: ts.Node): void; warn(text: string, pos: number, file: MinimalSourceFile): void; @@ -130,7 +128,6 @@ export class Logger { * Log the given error. * * @param text The error that should be logged. - * @param args The arguments that should be printed into the given error. */ error(text: string, node?: ts.Node): void; error(text: string, pos: number, file: MinimalSourceFile): void; diff --git a/src/test/converter/alias/specs.json b/src/test/converter/alias/specs.json index 1bee57d4a..1d1bc0050 100644 --- a/src/test/converter/alias/specs.json +++ b/src/test/converter/alias/specs.json @@ -40,8 +40,9 @@ "type": "conditional", "checkType": { "type": "reference", - "target": -1, + "target": 9, "name": "T", + "package": "typedoc", "refersToTypeParameter": true }, "extendsType": { @@ -126,8 +127,9 @@ "type": "conditional", "checkType": { "type": "reference", - "target": -1, + "target": 11, "name": "T", + "package": "typedoc", "refersToTypeParameter": true }, "extendsType": { @@ -147,14 +149,19 @@ }, "trueType": { "type": "reference", - "target": -1, + "target": { + "sourceFileName": "src/test/converter/alias/alias.ts", + "qualifiedName": "U" + }, "name": "U", + "package": "typedoc", "refersToTypeParameter": true }, "falseType": { "type": "reference", - "target": -1, + "target": 11, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -222,8 +229,9 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 6, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } }, @@ -235,8 +243,9 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 6, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } diff --git a/src/test/converter/class/specs-with-lump-categories.json b/src/test/converter/class/specs-with-lump-categories.json index b36d7b69f..4b308824e 100644 --- a/src/test/converter/class/specs-with-lump-categories.json +++ b/src/test/converter/class/specs-with-lump-categories.json @@ -4115,8 +4115,10 @@ }, "type": { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } } @@ -4127,8 +4129,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } ], @@ -4164,8 +4168,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } }, @@ -4197,8 +4203,10 @@ "type": "array", "elementType": { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } } @@ -4253,8 +4261,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } } @@ -5046,8 +5056,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 214, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } ], @@ -5073,8 +5085,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 214, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } } diff --git a/src/test/converter/class/specs.json b/src/test/converter/class/specs.json index b36d7b69f..4b308824e 100644 --- a/src/test/converter/class/specs.json +++ b/src/test/converter/class/specs.json @@ -4115,8 +4115,10 @@ }, "type": { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } } @@ -4127,8 +4129,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } ], @@ -4164,8 +4168,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } }, @@ -4197,8 +4203,10 @@ "type": "array", "elementType": { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } } @@ -4253,8 +4261,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 170, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } } @@ -5046,8 +5056,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 214, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } ], @@ -5073,8 +5085,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 214, "name": "T", + "package": "typedoc", + "qualifiedName": "GenericClass.T", "refersToTypeParameter": true } } diff --git a/src/test/converter/function/specs.json b/src/test/converter/function/specs.json index 6853fd849..95c195124 100644 --- a/src/test/converter/function/specs.json +++ b/src/test/converter/function/specs.json @@ -512,8 +512,9 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 78, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -542,8 +543,9 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 78, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ], @@ -635,8 +637,9 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 85, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -698,8 +701,9 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 85, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ], @@ -785,8 +789,9 @@ }, { "type": "reference", - "target": -1, + "target": 47, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ] @@ -799,8 +804,9 @@ "asserts": true, "targetType": { "type": "reference", - "target": -1, + "target": 47, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -1550,8 +1556,9 @@ }, { "type": "reference", - "target": -1, + "target": 51, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ] @@ -1564,8 +1571,9 @@ "asserts": false, "targetType": { "type": "reference", - "target": -1, + "target": 51, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -2108,8 +2116,9 @@ }, "type": { "type": "reference", - "target": -1, + "target": 100, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } }, @@ -2131,8 +2140,9 @@ "type": "array", "elementType": { "type": "reference", - "target": -1, + "target": 100, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -2142,8 +2152,9 @@ "type": "array", "elementType": { "type": "reference", - "target": -1, + "target": 100, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -2213,16 +2224,18 @@ }, "type": { "type": "reference", - "target": -1, + "target": 105, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } ], "type": { "type": "reference", - "target": -1, + "target": 105, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -2319,16 +2332,18 @@ }, "type": { "type": "reference", - "target": -1, + "target": 96, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } ], "type": { "type": "reference", - "target": -1, + "target": 96, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } diff --git a/src/test/converter/inheritance/specs.json b/src/test/converter/inheritance/specs.json index 0480cc60e..f61997853 100644 --- a/src/test/converter/inheritance/specs.json +++ b/src/test/converter/inheritance/specs.json @@ -63,8 +63,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 17, "name": "T", + "package": "typedoc", + "qualifiedName": "InterfaceSource.T", "refersToTypeParameter": true } }, @@ -120,8 +122,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 17, "name": "T", + "package": "typedoc", + "qualifiedName": "InterfaceSource.T", "refersToTypeParameter": true } } @@ -207,8 +211,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 23, "name": "T", + "package": "typedoc", + "qualifiedName": "InterfaceTarget.T", "refersToTypeParameter": true } }, @@ -264,8 +270,10 @@ ], "type": { "type": "reference", - "target": -1, + "target": 23, "name": "T", + "package": "typedoc", + "qualifiedName": "InterfaceTarget.T", "refersToTypeParameter": true } } @@ -412,8 +420,9 @@ }, "type": { "type": "reference", - "target": -1, + "target": 4, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } }, @@ -433,8 +442,9 @@ }, "type": { "type": "reference", - "target": -1, + "target": 4, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -555,8 +565,9 @@ }, "type": { "type": "reference", - "target": -1, + "target": 9, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } }, @@ -576,8 +587,9 @@ }, "type": { "type": "reference", - "target": -1, + "target": 9, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } diff --git a/src/test/converter/interface/specs.json b/src/test/converter/interface/specs.json index 225410b6b..fdc8b8859 100644 --- a/src/test/converter/interface/specs.json +++ b/src/test/converter/interface/specs.json @@ -723,8 +723,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 84, "name": "T", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcher.T", "refersToTypeParameter": true } ], @@ -759,8 +761,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 84, "name": "T", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcher.T", "refersToTypeParameter": true } ], @@ -812,8 +816,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 84, "name": "T", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcher.T", "refersToTypeParameter": true } ], @@ -853,8 +859,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 84, "name": "T", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcher.T", "refersToTypeParameter": true } ], @@ -959,8 +967,10 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 84, "name": "T", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcher.T", "refersToTypeParameter": true } } @@ -1070,8 +1080,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 84, "name": "T", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcher.T", "refersToTypeParameter": true } ], @@ -1147,8 +1159,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 84, "name": "T", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcher.T", "refersToTypeParameter": true } ], @@ -1224,8 +1238,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 52, "name": "V", + "package": "typedoc", + "qualifiedName": "Forms.Subscription.V", "refersToTypeParameter": true } ], @@ -1268,8 +1284,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 52, "name": "V", + "package": "typedoc", + "qualifiedName": "Forms.Subscription.V", "refersToTypeParameter": true } ], @@ -1285,8 +1303,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 52, "name": "V", + "package": "typedoc", + "qualifiedName": "Forms.Subscription.V", "refersToTypeParameter": true } ], @@ -1319,8 +1339,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 52, "name": "V", + "package": "typedoc", + "qualifiedName": "Forms.Subscription.V", "refersToTypeParameter": true } ], @@ -1377,8 +1399,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 52, "name": "V", + "package": "typedoc", + "qualifiedName": "Forms.Subscription.V", "refersToTypeParameter": true } ], @@ -1520,8 +1544,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 52, "name": "V", + "package": "typedoc", + "qualifiedName": "Forms.Subscription.V", "refersToTypeParameter": true } ], @@ -1588,8 +1614,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 80, "name": "U", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcherInt.U", "refersToTypeParameter": true } ], @@ -1631,8 +1659,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 80, "name": "U", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcherInt.U", "refersToTypeParameter": true } ], @@ -1717,8 +1747,10 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 80, "name": "U", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcherInt.U", "refersToTypeParameter": true } } @@ -1808,8 +1840,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 80, "name": "U", + "package": "typedoc", + "qualifiedName": "Forms.EventDispatcherInt.U", "refersToTypeParameter": true } ], @@ -1927,8 +1961,10 @@ }, "type": { "type": "reference", - "target": -1, + "target": 39, "name": "T", + "package": "typedoc", + "qualifiedName": "Forms.EventListener.T", "refersToTypeParameter": true } } @@ -1994,8 +2030,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 48, "name": "T", + "package": "typedoc", + "qualifiedName": "Forms.SubscriptionInt.T", "refersToTypeParameter": true } ], diff --git a/src/test/converter/js/specs.json b/src/test/converter/js/specs.json index 84692b94f..a51677c34 100644 --- a/src/test/converter/js/specs.json +++ b/src/test/converter/js/specs.json @@ -480,8 +480,9 @@ ], "type": { "type": "reference", - "target": -1, + "target": 41, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } }, @@ -540,16 +541,18 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 35, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } ], "type": { "type": "reference", - "target": -1, + "target": 35, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } diff --git a/src/test/converter/mixin/specs.json b/src/test/converter/mixin/specs.json index 896b4f659..c96ba825a 100644 --- a/src/test/converter/mixin/specs.json +++ b/src/test/converter/mixin/specs.json @@ -1303,8 +1303,9 @@ ], "type": { "type": "reference", - "target": -1, + "target": 10, "name": "A", + "package": "typedoc", "refersToTypeParameter": true } } @@ -1390,8 +1391,9 @@ ], "type": { "type": "reference", - "target": -1, + "target": 5, "name": "A", + "package": "typedoc", "refersToTypeParameter": true } } @@ -1452,8 +1454,9 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 12, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ], @@ -1592,8 +1595,9 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 21, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -1685,8 +1689,9 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 21, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ], @@ -1699,8 +1704,9 @@ }, { "type": "reference", - "target": -1, + "target": 21, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ] @@ -1788,8 +1794,9 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 37, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -1881,8 +1888,9 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 37, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ], @@ -1895,8 +1903,9 @@ }, { "type": "reference", - "target": -1, + "target": 37, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ] @@ -1977,8 +1986,9 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 57, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -2070,8 +2080,9 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 57, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ], @@ -2084,8 +2095,9 @@ }, { "type": "reference", - "target": -1, + "target": 57, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } ] diff --git a/src/test/converter/types/specs.json b/src/test/converter/types/specs.json index a7d14a641..c8428ec5e 100644 --- a/src/test/converter/types/specs.json +++ b/src/test/converter/types/specs.json @@ -87,8 +87,9 @@ "type": "conditional", "checkType": { "type": "reference", - "target": -1, + "target": 12, "name": "T", + "package": "typedoc", "refersToTypeParameter": true }, "extendsType": { @@ -116,8 +117,12 @@ }, "trueType": { "type": "reference", - "target": -1, + "target": { + "sourceFileName": "src/test/converter/types/general.ts", + "qualifiedName": "S" + }, "name": "S", + "package": "typedoc", "refersToTypeParameter": true }, "falseType": { @@ -545,8 +550,9 @@ "operator": "keyof", "target": { "type": "reference", - "target": -1, + "target": 35, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } }, @@ -560,14 +566,19 @@ "type": "indexedAccess", "indexType": { "type": "reference", - "target": -1, + "target": { + "sourceFileName": "src/test/converter/types/mapped.ts", + "qualifiedName": "K" + }, "name": "K", + "package": "typedoc", "refersToTypeParameter": true }, "objectType": { "type": "reference", - "target": -1, + "target": 35, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } }, @@ -578,8 +589,12 @@ [ { "type": "reference", - "target": -1, + "target": { + "sourceFileName": "src/test/converter/types/mapped.ts", + "qualifiedName": "K" + }, "name": "K", + "package": "typedoc", "refersToTypeParameter": true }, "" @@ -587,8 +602,12 @@ [ { "type": "reference", - "target": -1, + "target": { + "sourceFileName": "src/test/converter/types/mapped.ts", + "qualifiedName": "K" + }, "name": "K", + "package": "typedoc", "refersToTypeParameter": true }, "" @@ -628,8 +647,9 @@ "operator": "keyof", "target": { "type": "reference", - "target": -1, + "target": 33, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } }, @@ -637,14 +657,19 @@ "type": "indexedAccess", "indexType": { "type": "reference", - "target": -1, + "target": { + "sourceFileName": "src/test/converter/types/mapped.ts", + "qualifiedName": "K" + }, "name": "K", + "package": "typedoc", "refersToTypeParameter": true }, "objectType": { "type": "reference", - "target": -1, + "target": 33, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -697,8 +722,9 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 30, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } @@ -714,14 +740,19 @@ "type": "indexedAccess", "indexType": { "type": "reference", - "target": -1, + "target": { + "sourceFileName": "src/test/converter/types/mapped.ts", + "qualifiedName": "K" + }, "name": "K", + "package": "typedoc", "refersToTypeParameter": true }, "objectType": { "type": "reference", - "target": -1, + "target": 30, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } }, @@ -732,8 +763,12 @@ [ { "type": "reference", - "target": -1, + "target": { + "sourceFileName": "src/test/converter/types/mapped.ts", + "qualifiedName": "K" + }, "name": "K", + "package": "typedoc", "refersToTypeParameter": true }, "" @@ -741,8 +776,12 @@ [ { "type": "reference", - "target": -1, + "target": { + "sourceFileName": "src/test/converter/types/mapped.ts", + "qualifiedName": "K" + }, "name": "K", + "package": "typedoc", "refersToTypeParameter": true }, "" @@ -800,8 +839,9 @@ "flags": {}, "type": { "type": "reference", - "target": -1, + "target": 26, "name": "T", + "package": "typedoc", "refersToTypeParameter": true } } diff --git a/src/test/converter/variables/specs.json b/src/test/converter/variables/specs.json index 6eb4cefe7..cc2390a04 100644 --- a/src/test/converter/variables/specs.json +++ b/src/test/converter/variables/specs.json @@ -55,8 +55,10 @@ "typeArguments": [ { "type": "reference", - "target": -1, + "target": 5, "name": "T", + "package": "typedoc", + "qualifiedName": "Array.T", "refersToTypeParameter": true } ], diff --git a/static/style.css b/static/style.css index 8191c6105..27bfdcceb 100644 --- a/static/style.css +++ b/static/style.css @@ -29,7 +29,7 @@ --light-color-ts-constructor-signature: var(--light-color-ts-constructor); --light-color-ts-parameter: var(--light-color-ts-variable); /* type literal not included as links will never be generated to it */ - --light-color-ts-type-parameter: var(--light-color-ts-type-alias); + --light-color-ts-type-parameter: #a55c0e; --light-color-ts-accessor: var(--light-color-ts-property); --light-color-ts-get-signature: var(--light-color-ts-accessor); --light-color-ts-set-signature: var(--light-color-ts-accessor); @@ -69,7 +69,7 @@ --dark-color-ts-constructor-signature: var(--dark-color-ts-constructor); --dark-color-ts-parameter: var(--dark-color-ts-variable); /* type literal not included as links will never be generated to it */ - --dark-color-ts-type-parameter: var(--dark-color-ts-type-alias); + --dark-color-ts-type-parameter: #e07d13; --dark-color-ts-accessor: var(--dark-color-ts-property); --dark-color-ts-get-signature: var(--dark-color-ts-accessor); --dark-color-ts-set-signature: var(--dark-color-ts-accessor);