From d248684bf941c4fc26ce16569e23a2f21f278a6d Mon Sep 17 00:00:00 2001 From: Bodil Stokke <17880+bodil@users.noreply.github.com> Date: Tue, 26 Jul 2022 13:26:41 +0100 Subject: [PATCH 1/3] Decide a ReferenceType's package name by looking for a package.json. --- src/lib/models/types.ts | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/src/lib/models/types.ts b/src/lib/models/types.ts index ce4fc8db4..98da1764f 100644 --- a/src/lib/models/types.ts +++ b/src/lib/models/types.ts @@ -1,3 +1,6 @@ +import * as fs from "fs"; +import * as path from "path"; + import type * as ts from "typescript"; import type { Context } from "../converter"; import { Reflection } from "./reflections/abstract"; @@ -847,18 +850,28 @@ export class ReferenceType extends Type { .fileName.replace(/\\/g, "/"); if (!symbolPath) return ref; - let startIndex = symbolPath.indexOf("node_modules/"); - if (startIndex === -1) return ref; - startIndex += "node_modules/".length; - let stopIndex = symbolPath.indexOf("/", startIndex); - // Scoped package, e.g. `@types/node` - if (symbolPath[startIndex] === "@") { - stopIndex = symbolPath.indexOf("/", stopIndex + 1); + function findPackageForPath(sourcePath: string): string | undefined { + let basePath = sourcePath; + for (;;) { + const nextPath = path.dirname(basePath); + if (nextPath === basePath) { + return; + } + basePath = nextPath; + const projectPath = path.join(basePath, "package.json"); + try { + const packageJsonData = fs.readFileSync(projectPath, { + encoding: "utf8", + }); + const packageJson = JSON.parse(packageJsonData); + return packageJson.name; + } catch (err) { + continue; + } + } } - const packageName = symbolPath.substring(startIndex, stopIndex); - ref.package = packageName; - + ref.package = findPackageForPath(symbolPath); return ref; } From 65dfba35dbd1cba268bda4b8a03acc3abcf8fa39 Mon Sep 17 00:00:00 2001 From: Bodil Stokke <17880+bodil@users.noreply.github.com> Date: Wed, 27 Jul 2022 15:41:33 +0100 Subject: [PATCH 2/3] Try looking for a node_modules path first, and cache expensive lookups. --- src/lib/models/types.ts | 59 ++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/src/lib/models/types.ts b/src/lib/models/types.ts index 98da1764f..178e48e46 100644 --- a/src/lib/models/types.ts +++ b/src/lib/models/types.ts @@ -850,27 +850,21 @@ export class ReferenceType extends Type { .fileName.replace(/\\/g, "/"); if (!symbolPath) return ref; - function findPackageForPath(sourcePath: string): string | undefined { - let basePath = sourcePath; - for (;;) { - const nextPath = path.dirname(basePath); - if (nextPath === basePath) { - return; - } - basePath = nextPath; - const projectPath = path.join(basePath, "package.json"); - try { - const packageJsonData = fs.readFileSync(projectPath, { - encoding: "utf8", - }); - const packageJson = JSON.parse(packageJsonData); - return packageJson.name; - } catch (err) { - continue; - } + // Attempt to decide package name from path if it contains "node_modules" + let startIndex = symbolPath.lastIndexOf("node_modules/"); + if (startIndex !== -1) { + startIndex += "node_modules/".length; + let stopIndex = symbolPath.indexOf("/", startIndex); + // Scoped package, e.g. `@types/node` + if (symbolPath[startIndex] === "@") { + stopIndex = symbolPath.indexOf("/", stopIndex + 1); } + const packageName = symbolPath.substring(startIndex, stopIndex); + ref.package = packageName; + return ref; } + // Otherwise, look for a "package.json" file in a parent path ref.package = findPackageForPath(symbolPath); return ref; } @@ -1300,3 +1294,32 @@ export class UnknownType extends Type { }; } } + +const packageJsonLookupCache: Record = {}; + +function findPackageForPath(sourcePath: string): string | undefined { + if (packageJsonLookupCache[sourcePath] !== undefined) { + return packageJsonLookupCache[sourcePath]; + } + let basePath = sourcePath; + for (;;) { + const nextPath = path.dirname(basePath); + if (nextPath === basePath) { + return; + } + basePath = nextPath; + const projectPath = path.join(basePath, "package.json"); + try { + const packageJsonData = fs.readFileSync(projectPath, { + encoding: "utf8", + }); + const packageJson = JSON.parse(packageJsonData); + if (packageJson.name !== undefined) { + packageJsonLookupCache[sourcePath] = packageJson.name; + } + return packageJson.name; + } catch (err) { + continue; + } + } +} From 1be726c4faa833317a408ef9c23877c12fb8ceb9 Mon Sep 17 00:00:00 2001 From: Gerrit Birkeland Date: Sat, 6 Aug 2022 08:23:10 -0600 Subject: [PATCH 3/3] Fix failing tests --- src/lib/models/types.ts | 13 +- src/lib/serialization/schema.ts | 6 +- src/lib/types/ts-internal/index.d.ts | 4 + src/lib/utils/tsutils.ts | 25 +-- src/test/converter/alias/specs.json | 24 ++- .../class/specs-with-lump-categories.json | 136 ++++++++++---- src/test/converter/class/specs.json | 136 ++++++++++---- src/test/converter/comment/specs.json | 4 +- src/test/converter/declaration/specs.json | 12 +- src/test/converter/exports/specs.json | 16 +- src/test/converter/function/specs.json | 84 ++++++--- .../converter/inherit-param-doc/specs.json | 24 ++- src/test/converter/inheritance/specs.json | 48 +++-- src/test/converter/interface/specs.json | 172 +++++++++++++----- src/test/converter/js/specs.json | 12 +- src/test/converter/mixin/specs.json | 172 +++++++++++++----- src/test/converter/react/specs.json | 8 +- src/test/converter/types/specs.json | 96 +++++++--- src/test/converter/variables/specs.json | 32 +++- src/test/converter/variables/specs.nodoc.json | 16 +- 20 files changed, 770 insertions(+), 270 deletions(-) diff --git a/src/lib/models/types.ts b/src/lib/models/types.ts index 178e48e46..a9cd478f2 100644 --- a/src/lib/models/types.ts +++ b/src/lib/models/types.ts @@ -842,7 +842,7 @@ export class ReferenceType extends Type { name ?? symbol.name, symbol, context.project, - getQualifiedName(context.checker, symbol) + getQualifiedName(symbol, name ?? symbol.name) ); const symbolPath = symbol?.declarations?.[0] @@ -894,19 +894,14 @@ export class ReferenceType extends Type { } override toObject(serializer: Serializer): JSONOutput.ReferenceType { - const result: JSONOutput.ReferenceType = { + return { type: this.type, id: this.reflection?.id, typeArguments: serializer.toObjectsOptional(this.typeArguments), name: this.name, + qualifiedName: this.qualifiedName, + package: this.package, }; - - if (this.package) { - result.qualifiedName = this.qualifiedName; - result.package = this.package; - } - - return result; } } diff --git a/src/lib/serialization/schema.ts b/src/lib/serialization/schema.ts index 53a80cff7..5f56997af 100644 --- a/src/lib/serialization/schema.ts +++ b/src/lib/serialization/schema.ts @@ -243,9 +243,11 @@ export interface QueryType extends Type, S {} export interface ReferenceType extends Type, - S { + S< + M.ReferenceType, + "type" | "name" | "typeArguments" | "package" | "qualifiedName" + > { id?: number; - qualifiedName?: string; } export interface ReflectionType extends Type, S { diff --git a/src/lib/types/ts-internal/index.d.ts b/src/lib/types/ts-internal/index.d.ts index ba49a74b0..9f5349b59 100644 --- a/src/lib/types/ts-internal/index.d.ts +++ b/src/lib/types/ts-internal/index.d.ts @@ -12,6 +12,10 @@ declare module "typescript" { interface Symbol { // https://github.com/microsoft/TypeScript/blob/v4.1.5/src/compiler/types.ts#L4734-L4737 checkFlags?: CheckFlags; + + // https://github.com/microsoft/TypeScript/blob/v4.7.4/src/compiler/types.ts#L4941 + // https://github.com/microsoft/TypeScript/issues/38344 + parent?: ts.Symbol; } interface TypeChecker { diff --git a/src/lib/utils/tsutils.ts b/src/lib/utils/tsutils.ts index 11a61355e..8380d0f81 100644 --- a/src/lib/utils/tsutils.ts +++ b/src/lib/utils/tsutils.ts @@ -1,14 +1,17 @@ -import type * as ts from "typescript"; +import * as ts from "typescript"; -export function getQualifiedName(checker: ts.TypeChecker, symbol: ts.Symbol) { - const qualifiedName = checker.getFullyQualifiedName(symbol); - // I think this is less bad than depending on symbol.parent... - // https://github.com/microsoft/TypeScript/issues/38344 - // It will break if someone names a directory with a quote in it, but so will lots - // of other things including other parts of TypeDoc. Until it *actually* breaks someone... - if (qualifiedName.startsWith('"') && qualifiedName.includes('".')) { - return qualifiedName.substring(qualifiedName.indexOf('".', 1) + 2); - } else { - return qualifiedName; +export function getQualifiedName(symbol: ts.Symbol, defaultName: string) { + // Two implementation options for this one: + // 1. Use the internal symbol.parent, to walk up until we hit a source file symbol (if in a module) + // or undefined (if in a global file) + // 2. Use checker.getFullyQualifiedName and parse out the name from the returned string. + // The symbol.parent method is easier to check for now. + let sym: ts.Symbol | undefined = symbol; + const parts: string[] = []; + while (sym && !sym.declarations?.some(ts.isSourceFile)) { + parts.unshift(sym.name); + sym = sym.parent; } + + return parts.join(".") || defaultName; } diff --git a/src/test/converter/alias/specs.json b/src/test/converter/alias/specs.json index e088b4600..6b51b5333 100644 --- a/src/test/converter/alias/specs.json +++ b/src/test/converter/alias/specs.json @@ -41,7 +41,9 @@ "checkType": { "type": "reference", "id": 9, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" }, "extendsType": { "type": "intrinsic", @@ -93,7 +95,9 @@ "checkType": { "type": "reference", "id": 11, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" }, "extendsType": { "type": "reference", @@ -109,12 +113,16 @@ }, "trueType": { "type": "reference", - "name": "U" + "name": "U", + "qualifiedName": "U", + "package": "typedoc" }, "falseType": { "type": "reference", "id": 11, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } }, @@ -182,7 +190,9 @@ "type": { "type": "reference", "id": 6, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -194,7 +204,9 @@ "type": { "type": "reference", "id": 6, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], diff --git a/src/test/converter/class/specs-with-lump-categories.json b/src/test/converter/class/specs-with-lump-categories.json index 4c3d87441..1db5d248e 100644 --- a/src/test/converter/class/specs-with-lump-categories.json +++ b/src/test/converter/class/specs-with-lump-categories.json @@ -537,7 +537,9 @@ "type": { "type": "reference", "id": 85, - "name": "Abstract" + "name": "Abstract", + "qualifiedName": "Abstract", + "package": "typedoc" } } ] @@ -619,7 +621,9 @@ "type": { "type": "reference", "id": 74, - "name": "ComputedNames" + "name": "ComputedNames", + "qualifiedName": "ComputedNames", + "package": "typedoc" } } ] @@ -756,7 +760,9 @@ "type": { "type": "reference", "id": 62, - "name": "TestAbstractClass" + "name": "TestAbstractClass", + "qualifiedName": "TestAbstractClass", + "package": "typedoc" } } ] @@ -873,7 +879,9 @@ "type": { "type": "reference", "id": 68, - "name": "TestAbstractClassImplementation" + "name": "TestAbstractClassImplementation", + "qualifiedName": "TestAbstractClassImplementation", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -985,7 +993,9 @@ { "type": "reference", "id": 62, - "name": "TestAbstractClass" + "name": "TestAbstractClass", + "qualifiedName": "TestAbstractClass", + "package": "typedoc" } ] }, @@ -1053,7 +1063,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } ] @@ -1146,7 +1158,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } }, { @@ -1550,7 +1564,9 @@ "type": { "type": "reference", "id": 38, - "name": "TestSubClass" + "name": "TestSubClass", + "qualifiedName": "TestSubClass", + "package": "typedoc" }, "overwrites": { "type": "reference", @@ -1668,7 +1684,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -1954,7 +1972,9 @@ { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } ] }, @@ -1981,7 +2001,9 @@ "type": { "type": "reference", "id": 81, - "name": "Ts38PrivateFields" + "name": "Ts38PrivateFields", + "qualifiedName": "Ts38PrivateFields", + "package": "typedoc" } } ] @@ -2082,7 +2104,9 @@ "type": { "type": "reference", "id": 85, - "name": "Abstract" + "name": "Abstract", + "qualifiedName": "Abstract", + "package": "typedoc" } } ] @@ -2230,7 +2254,9 @@ "type": { "type": "reference", "id": 94, - "name": "Vector2" + "name": "Vector2", + "qualifiedName": "Vector2", + "package": "typedoc" } } ] @@ -2448,7 +2474,9 @@ "type": { "type": "reference", "id": 103, - "name": "Vector3" + "name": "Vector3", + "qualifiedName": "Vector3", + "package": "typedoc" }, "overwrites": { "type": "reference", @@ -2592,7 +2620,9 @@ { "type": "reference", "id": 94, - "name": "Vector2" + "name": "Vector2", + "qualifiedName": "Vector2", + "package": "typedoc" } ] } @@ -2653,7 +2683,9 @@ "type": { "type": "reference", "id": 128, - "name": "DecoratedClass" + "name": "DecoratedClass", + "qualifiedName": "DecoratedClass", + "package": "typedoc" } } ] @@ -3033,7 +3065,9 @@ "type": { "type": "reference", "id": 161, - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "EventDispatcher", + "package": "typedoc" } } ] @@ -3688,7 +3722,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ], @@ -3699,10 +3735,14 @@ { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } } ] @@ -3734,7 +3774,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } }, { @@ -3766,7 +3808,9 @@ "elementType": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } }, @@ -3813,7 +3857,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ] @@ -3941,7 +3987,9 @@ "type": { "type": "reference", "id": 176, - "name": "NonGenericClass" + "name": "NonGenericClass", + "qualifiedName": "NonGenericClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -4124,7 +4172,9 @@ "name": "string" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } ] } @@ -4177,7 +4227,9 @@ "type": { "type": "reference", "id": 185, - "name": "GetterSetter" + "name": "GetterSetter", + "qualifiedName": "GetterSetter", + "package": "typedoc" } } ] @@ -4412,7 +4464,9 @@ "type": { "type": "reference", "id": 199, - "name": "ChainClass" + "name": "ChainClass", + "qualifiedName": "ChainClass", + "package": "typedoc" } } ] @@ -4451,7 +4505,9 @@ "type": { "type": "reference", "id": 199, - "name": "ChainClass" + "name": "ChainClass", + "qualifiedName": "ChainClass", + "package": "typedoc" } } ] @@ -4538,7 +4594,9 @@ "target": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } } @@ -4550,10 +4608,14 @@ { "type": "reference", "id": 213, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } } ] @@ -4575,7 +4637,9 @@ "type": { "type": "reference", "id": 213, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ], @@ -4614,7 +4678,9 @@ "target": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } } @@ -4668,7 +4734,9 @@ "type": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } ] diff --git a/src/test/converter/class/specs.json b/src/test/converter/class/specs.json index b7e1e123a..6dc8b1145 100644 --- a/src/test/converter/class/specs.json +++ b/src/test/converter/class/specs.json @@ -537,7 +537,9 @@ "type": { "type": "reference", "id": 85, - "name": "Abstract" + "name": "Abstract", + "qualifiedName": "Abstract", + "package": "typedoc" } } ] @@ -619,7 +621,9 @@ "type": { "type": "reference", "id": 74, - "name": "ComputedNames" + "name": "ComputedNames", + "qualifiedName": "ComputedNames", + "package": "typedoc" } } ] @@ -756,7 +760,9 @@ "type": { "type": "reference", "id": 62, - "name": "TestAbstractClass" + "name": "TestAbstractClass", + "qualifiedName": "TestAbstractClass", + "package": "typedoc" } } ] @@ -873,7 +879,9 @@ "type": { "type": "reference", "id": 68, - "name": "TestAbstractClassImplementation" + "name": "TestAbstractClassImplementation", + "qualifiedName": "TestAbstractClassImplementation", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -985,7 +993,9 @@ { "type": "reference", "id": 62, - "name": "TestAbstractClass" + "name": "TestAbstractClass", + "qualifiedName": "TestAbstractClass", + "package": "typedoc" } ] }, @@ -1053,7 +1063,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } ] @@ -1146,7 +1158,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } }, { @@ -1546,7 +1560,9 @@ "type": { "type": "reference", "id": 38, - "name": "TestSubClass" + "name": "TestSubClass", + "qualifiedName": "TestSubClass", + "package": "typedoc" }, "overwrites": { "type": "reference", @@ -1664,7 +1680,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -1950,7 +1968,9 @@ { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } ] }, @@ -1977,7 +1997,9 @@ "type": { "type": "reference", "id": 81, - "name": "Ts38PrivateFields" + "name": "Ts38PrivateFields", + "qualifiedName": "Ts38PrivateFields", + "package": "typedoc" } } ] @@ -2078,7 +2100,9 @@ "type": { "type": "reference", "id": 85, - "name": "Abstract" + "name": "Abstract", + "qualifiedName": "Abstract", + "package": "typedoc" } } ] @@ -2226,7 +2250,9 @@ "type": { "type": "reference", "id": 94, - "name": "Vector2" + "name": "Vector2", + "qualifiedName": "Vector2", + "package": "typedoc" } } ] @@ -2444,7 +2470,9 @@ "type": { "type": "reference", "id": 103, - "name": "Vector3" + "name": "Vector3", + "qualifiedName": "Vector3", + "package": "typedoc" }, "overwrites": { "type": "reference", @@ -2588,7 +2616,9 @@ { "type": "reference", "id": 94, - "name": "Vector2" + "name": "Vector2", + "qualifiedName": "Vector2", + "package": "typedoc" } ] } @@ -2649,7 +2679,9 @@ "type": { "type": "reference", "id": 128, - "name": "DecoratedClass" + "name": "DecoratedClass", + "qualifiedName": "DecoratedClass", + "package": "typedoc" } } ] @@ -3029,7 +3061,9 @@ "type": { "type": "reference", "id": 161, - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "EventDispatcher", + "package": "typedoc" } } ] @@ -3684,7 +3718,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ], @@ -3695,10 +3731,14 @@ { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } } ] @@ -3730,7 +3770,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } }, { @@ -3762,7 +3804,9 @@ "elementType": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } }, @@ -3809,7 +3853,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ] @@ -3937,7 +3983,9 @@ "type": { "type": "reference", "id": 176, - "name": "NonGenericClass" + "name": "NonGenericClass", + "qualifiedName": "NonGenericClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -4120,7 +4168,9 @@ "name": "string" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } ] } @@ -4173,7 +4223,9 @@ "type": { "type": "reference", "id": 185, - "name": "GetterSetter" + "name": "GetterSetter", + "qualifiedName": "GetterSetter", + "package": "typedoc" } } ] @@ -4408,7 +4460,9 @@ "type": { "type": "reference", "id": 199, - "name": "ChainClass" + "name": "ChainClass", + "qualifiedName": "ChainClass", + "package": "typedoc" } } ] @@ -4447,7 +4501,9 @@ "type": { "type": "reference", "id": 199, - "name": "ChainClass" + "name": "ChainClass", + "qualifiedName": "ChainClass", + "package": "typedoc" } } ] @@ -4534,7 +4590,9 @@ "target": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } } @@ -4546,10 +4604,14 @@ { "type": "reference", "id": 213, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } } ] @@ -4571,7 +4633,9 @@ "type": { "type": "reference", "id": 213, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ], @@ -4610,7 +4674,9 @@ "target": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } } @@ -4664,7 +4730,9 @@ "type": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } ] diff --git a/src/test/converter/comment/specs.json b/src/test/converter/comment/specs.json index 94f18aab6..56a6efd5f 100644 --- a/src/test/converter/comment/specs.json +++ b/src/test/converter/comment/specs.json @@ -61,7 +61,9 @@ "type": { "type": "reference", "id": 2, - "name": "CommentedClass" + "name": "CommentedClass", + "qualifiedName": "CommentedClass", + "package": "typedoc" } } ] diff --git a/src/test/converter/declaration/specs.json b/src/test/converter/declaration/specs.json index 14f233239..fca6e209a 100644 --- a/src/test/converter/declaration/specs.json +++ b/src/test/converter/declaration/specs.json @@ -34,7 +34,9 @@ "type": { "type": "reference", "id": 2, - "name": "Decl" + "name": "Decl", + "qualifiedName": "Decl", + "package": "typedoc" } } ] @@ -157,7 +159,9 @@ "type": { "type": "reference", "id": 8, - "name": "Exported" + "name": "Exported", + "qualifiedName": "Exported", + "package": "typedoc" } } ] @@ -203,7 +207,9 @@ "type": { "type": "reference", "id": 11, - "name": "NotExported" + "name": "NotExported", + "qualifiedName": "NotExported", + "package": "typedoc" } } ] diff --git a/src/test/converter/exports/specs.json b/src/test/converter/exports/specs.json index 7efe65460..9e1cbdbe5 100644 --- a/src/test/converter/exports/specs.json +++ b/src/test/converter/exports/specs.json @@ -179,7 +179,9 @@ "type": { "type": "reference", "id": 29, - "name": "GH1453Helper" + "name": "GH1453Helper", + "qualifiedName": "GH1453Helper", + "package": "typedoc" } }, { @@ -223,7 +225,9 @@ "type": { "type": "reference", "id": 29, - "name": "__module" + "name": "__module", + "qualifiedName": "__module", + "package": "typedoc" }, "defaultValue": "Mod" }, @@ -246,7 +250,9 @@ "type": { "type": "reference", "id": 29, - "name": "a" + "name": "a", + "qualifiedName": "a", + "package": "typedoc" }, "defaultValue": "Mod.a" }, @@ -269,7 +275,9 @@ "type": { "type": "reference", "id": 29, - "name": "__module" + "name": "__module", + "qualifiedName": "__module", + "package": "typedoc" }, "defaultValue": "Mod" } diff --git a/src/test/converter/function/specs.json b/src/test/converter/function/specs.json index 12daa8fe2..4e9a0122b 100644 --- a/src/test/converter/function/specs.json +++ b/src/test/converter/function/specs.json @@ -238,7 +238,9 @@ "type": { "type": "reference", "id": 86, - "name": "Predicates" + "name": "Predicates", + "qualifiedName": "Predicates", + "package": "typedoc" } } ] @@ -506,7 +508,9 @@ "type": { "type": "reference", "id": 101, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -531,7 +535,9 @@ { "type": "reference", "id": 101, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ], "name": "Iterable", @@ -608,7 +614,9 @@ "type": { "type": "reference", "id": 108, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -658,7 +666,9 @@ { "type": "reference", "id": 108, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ], "name": "Iterable", @@ -737,7 +747,9 @@ { "type": "reference", "id": 69, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ] } @@ -750,7 +762,9 @@ "targetType": { "type": "reference", "id": 69, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } } @@ -1932,7 +1946,9 @@ { "type": "reference", "id": 73, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ] } @@ -1945,7 +1961,9 @@ "targetType": { "type": "reference", "id": 73, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } } @@ -2398,7 +2416,9 @@ "type": { "type": "reference", "id": 123, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -2420,7 +2440,9 @@ "elementType": { "type": "reference", "id": 123, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } } @@ -2430,7 +2452,9 @@ "elementType": { "type": "reference", "id": 123, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } } @@ -2492,14 +2516,18 @@ "type": { "type": "reference", "id": 128, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], "type": { "type": "reference", "id": 128, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ] @@ -2585,14 +2613,18 @@ "type": { "type": "reference", "id": 119, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], "type": { "type": "reference", "id": 119, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ] @@ -2735,7 +2767,9 @@ "type": { "type": "reference", "id": 139, - "name": "BreakpointRange" + "name": "BreakpointRange", + "qualifiedName": "BreakpointRange", + "package": "typedoc" } }, { @@ -2755,7 +2789,9 @@ "type": { "type": "reference", "id": 139, - "name": "BreakpointRange" + "name": "BreakpointRange", + "qualifiedName": "BreakpointRange", + "package": "typedoc" } }, { @@ -2775,7 +2811,9 @@ "type": { "type": "reference", "id": 139, - "name": "BreakpointRange" + "name": "BreakpointRange", + "qualifiedName": "BreakpointRange", + "package": "typedoc" } }, { @@ -2795,7 +2833,9 @@ "type": { "type": "reference", "id": 139, - "name": "BreakpointRange" + "name": "BreakpointRange", + "qualifiedName": "BreakpointRange", + "package": "typedoc" } }, { @@ -2815,7 +2855,9 @@ "type": { "type": "reference", "id": 139, - "name": "BreakpointRange" + "name": "BreakpointRange", + "qualifiedName": "BreakpointRange", + "package": "typedoc" } } ], diff --git a/src/test/converter/inherit-param-doc/specs.json b/src/test/converter/inherit-param-doc/specs.json index 32c74075b..e3d653079 100644 --- a/src/test/converter/inherit-param-doc/specs.json +++ b/src/test/converter/inherit-param-doc/specs.json @@ -28,7 +28,9 @@ "type": { "type": "reference", "id": 6, - "name": "Class1" + "name": "Class1", + "qualifiedName": "Class1", + "package": "typedoc" } } ] @@ -138,7 +140,9 @@ { "type": "reference", "id": 1, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] }, @@ -165,7 +169,9 @@ "type": { "type": "reference", "id": 13, - "name": "Class2" + "name": "Class2", + "qualifiedName": "Class2", + "package": "typedoc" } } ] @@ -275,7 +281,9 @@ { "type": "reference", "id": 1, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] }, @@ -302,7 +310,9 @@ "type": { "type": "reference", "id": 20, - "name": "Class3" + "name": "Class3", + "qualifiedName": "Class3", + "package": "typedoc" } } ] @@ -412,7 +422,9 @@ { "type": "reference", "id": 1, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] }, diff --git a/src/test/converter/inheritance/specs.json b/src/test/converter/inheritance/specs.json index 115858b6c..7d2c9644f 100644 --- a/src/test/converter/inheritance/specs.json +++ b/src/test/converter/inheritance/specs.json @@ -63,7 +63,9 @@ "type": { "type": "reference", "id": 19, - "name": "T" + "name": "T", + "qualifiedName": "InterfaceSource.T", + "package": "typedoc" } }, { @@ -111,7 +113,9 @@ "type": { "type": "reference", "id": 19, - "name": "T" + "name": "T", + "qualifiedName": "InterfaceSource.T", + "package": "typedoc" } } ] @@ -197,7 +201,9 @@ "type": { "type": "reference", "id": 25, - "name": "T" + "name": "T", + "qualifiedName": "InterfaceTarget.T", + "package": "typedoc" } }, { @@ -245,7 +251,9 @@ "type": { "type": "reference", "id": 25, - "name": "T" + "name": "T", + "qualifiedName": "InterfaceTarget.T", + "package": "typedoc" } } ] @@ -384,7 +392,9 @@ "type": { "type": "reference", "id": 4, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -404,7 +414,9 @@ "type": { "type": "reference", "id": 4, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -563,7 +575,9 @@ "type": { "type": "reference", "id": 11, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -583,7 +597,9 @@ "type": { "type": "reference", "id": 11, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -659,7 +675,9 @@ "type": { "type": "reference", "id": 34, - "name": "MySubClass" + "name": "MySubClass", + "qualifiedName": "MySubClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -748,7 +766,9 @@ { "type": "reference", "id": 31, - "name": "My" + "name": "My", + "qualifiedName": "My", + "package": "typedoc" } ] }, @@ -833,7 +853,9 @@ "type": { "type": "reference", "id": 31, - "name": "My" + "name": "My", + "qualifiedName": "My", + "package": "typedoc" } } ] @@ -904,7 +926,9 @@ "type": { "type": "reference", "id": 27, - "name": "MyCtor" + "name": "MyCtor", + "qualifiedName": "MyCtor", + "package": "typedoc" }, "extendedBy": [ { diff --git a/src/test/converter/interface/specs.json b/src/test/converter/interface/specs.json index 1fe5803f6..e523985d1 100644 --- a/src/test/converter/interface/specs.json +++ b/src/test/converter/interface/specs.json @@ -101,7 +101,9 @@ "type": { "type": "reference", "id": 2, - "name": "Constructor" + "name": "Constructor", + "qualifiedName": "Constructor", + "package": "typedoc" } }, { @@ -137,7 +139,9 @@ "type": { "type": "reference", "id": 13, - "name": "Instance" + "name": "Instance", + "qualifiedName": "Instance", + "package": "typedoc" } } ] @@ -435,7 +439,9 @@ "type": { "type": "reference", "id": 30, - "name": "ClassImplementingEmptyInterface" + "name": "ClassImplementingEmptyInterface", + "qualifiedName": "ClassImplementingEmptyInterface", + "package": "typedoc" } } ] @@ -524,7 +530,9 @@ { "type": "reference", "id": 29, - "name": "EmptyInterface" + "name": "EmptyInterface", + "qualifiedName": "EmptyInterface", + "package": "typedoc" } ] }, @@ -651,10 +659,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "Forms.EventDispatcher", + "package": "typedoc" } } ] @@ -684,10 +696,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } } }, @@ -726,10 +742,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "EventListener" + "name": "EventListener", + "qualifiedName": "Forms.EventListener", + "package": "typedoc" } }, { @@ -764,10 +784,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" }, "implementationOf": { "type": "reference", @@ -851,7 +875,9 @@ "type": { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } } ], @@ -945,10 +971,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } } ], @@ -1019,10 +1049,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "EventDispatcherInt" + "name": "EventDispatcherInt", + "qualifiedName": "Forms.EventDispatcherInt", + "package": "typedoc" } ] }, @@ -1085,10 +1119,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "EventListener" + "name": "EventListener", + "qualifiedName": "Forms.EventListener", + "package": "typedoc" } }, { @@ -1126,10 +1164,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "Forms.EventDispatcher", + "package": "typedoc" } } ], @@ -1140,10 +1182,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "Subscription" + "name": "Subscription", + "qualifiedName": "Forms.Subscription", + "package": "typedoc" } } ] @@ -1171,10 +1217,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "Forms.EventDispatcher", + "package": "typedoc" } }, { @@ -1226,10 +1276,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "EventListener" + "name": "EventListener", + "qualifiedName": "Forms.EventListener", + "package": "typedoc" }, "implementationOf": { "type": "reference", @@ -1358,10 +1412,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } ] }, @@ -1415,10 +1473,14 @@ { "type": "reference", "id": 80, - "name": "U" + "name": "U", + "qualifiedName": "Forms.EventDispatcherInt.U", + "package": "typedoc" } ], - "name": "EventListener" + "name": "EventListener", + "qualifiedName": "Forms.EventListener", + "package": "typedoc" } }, { @@ -1455,10 +1517,14 @@ { "type": "reference", "id": 80, - "name": "U" + "name": "U", + "qualifiedName": "Forms.EventDispatcherInt.U", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } } ] @@ -1522,7 +1588,9 @@ "type": { "type": "reference", "id": 80, - "name": "U" + "name": "U", + "qualifiedName": "Forms.EventDispatcherInt.U", + "package": "typedoc" } } ], @@ -1596,10 +1664,14 @@ { "type": "reference", "id": 80, - "name": "U" + "name": "U", + "qualifiedName": "Forms.EventDispatcherInt.U", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } } ], @@ -1696,7 +1768,9 @@ "type": { "type": "reference", "id": 39, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventListener.T", + "package": "typedoc" } } ], @@ -1762,10 +1836,14 @@ { "type": "reference", "id": 48, - "name": "T" + "name": "T", + "qualifiedName": "Forms.SubscriptionInt.T", + "package": "typedoc" } ], - "name": "EventListener" + "name": "EventListener", + "qualifiedName": "Forms.EventListener", + "package": "typedoc" } }, { @@ -2147,12 +2225,16 @@ { "type": "reference", "id": 103, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" }, { "type": "reference", "id": 105, - "name": "Base2" + "name": "Base2", + "qualifiedName": "Base2", + "package": "typedoc" } ], "extendedBy": [ @@ -2310,12 +2392,16 @@ { "type": "reference", "id": 107, - "name": "Child" + "name": "Child", + "qualifiedName": "Child", + "package": "typedoc" }, { "type": "reference", "id": 103, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] } diff --git a/src/test/converter/js/specs.json b/src/test/converter/js/specs.json index 3f1e08a45..75b105641 100644 --- a/src/test/converter/js/specs.json +++ b/src/test/converter/js/specs.json @@ -448,7 +448,9 @@ "type": { "type": "reference", "id": 41, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -507,14 +509,18 @@ "type": { "type": "reference", "id": 35, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], "type": { "type": "reference", "id": 35, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ] diff --git a/src/test/converter/mixin/specs.json b/src/test/converter/mixin/specs.json index 3072f8d4f..754c68b5a 100644 --- a/src/test/converter/mixin/specs.json +++ b/src/test/converter/mixin/specs.json @@ -36,7 +36,9 @@ "type": { "type": "reference", "id": 13, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } } ] @@ -150,7 +152,9 @@ "type": { "type": "reference", "id": 58, - "name": "SomeClassWithMixin" + "name": "SomeClassWithMixin", + "qualifiedName": "SomeClassWithMixin", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -352,7 +356,9 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } } } @@ -362,7 +368,9 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } }, "inheritedFrom": { @@ -407,14 +415,18 @@ "type": { "type": "reference", "id": 39, - "name": "Mixin2Type" + "name": "Mixin2Type", + "qualifiedName": "Mixin2Type", + "package": "typedoc" } } ], "type": { "type": "reference", "id": 39, - "name": "Mixin2Type" + "name": "Mixin2Type", + "qualifiedName": "Mixin2Type", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -497,7 +509,9 @@ "name": "any" } ], - "name": "Mixin1Class" + "name": "Mixin1Class", + "qualifiedName": "Mixin1Class", + "package": "typedoc" } } ], @@ -524,7 +538,9 @@ "queryType": { "type": "reference", "id": 13, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } } ] @@ -534,7 +550,9 @@ "name": "this" } ], - "name": "Mixin2" + "name": "Mixin2", + "qualifiedName": "Mixin2", + "package": "typedoc" }, { "type": "reference", @@ -545,7 +563,9 @@ "queryType": { "type": "reference", "id": 13, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } }, { @@ -553,7 +573,9 @@ "name": "this" } ], - "name": "Mixin1Class" + "name": "Mixin1Class", + "qualifiedName": "Mixin1Class", + "package": "typedoc" }, { "type": "reference", @@ -564,7 +586,9 @@ "name": "this" } ], - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] } @@ -702,7 +726,9 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } } } @@ -712,7 +738,9 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } }, "inheritedFrom": { @@ -761,11 +789,15 @@ "queryType": { "type": "reference", "id": 19, - "name": "Mixin1Func" + "name": "Mixin1Func", + "qualifiedName": "Mixin1Func", + "package": "typedoc" } } ], - "name": "Mixin" + "name": "Mixin", + "qualifiedName": "Mixin", + "package": "typedoc" } ] }, @@ -925,7 +957,9 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } } } @@ -935,7 +969,9 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } }, "inheritedFrom": { @@ -980,14 +1016,18 @@ "type": { "type": "reference", "id": 39, - "name": "Mixin2Type" + "name": "Mixin2Type", + "qualifiedName": "Mixin2Type", + "package": "typedoc" } } ], "type": { "type": "reference", "id": 39, - "name": "Mixin2Type" + "name": "Mixin2Type", + "qualifiedName": "Mixin2Type", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -1037,11 +1077,15 @@ "queryType": { "type": "reference", "id": 33, - "name": "Mixin2" + "name": "Mixin2", + "qualifiedName": "Mixin2", + "package": "typedoc" } } ], - "name": "Mixin" + "name": "Mixin", + "qualifiedName": "Mixin", + "package": "typedoc" } ] }, @@ -1124,7 +1168,9 @@ "type": { "type": "reference", "id": 10, - "name": "A" + "name": "A", + "qualifiedName": "A", + "package": "typedoc" } } ] @@ -1210,7 +1256,9 @@ "type": { "type": "reference", "id": 5, - "name": "A" + "name": "A", + "qualifiedName": "A", + "package": "typedoc" } } ] @@ -1249,7 +1297,9 @@ "type": { "type": "reference", "id": 1, - "name": "AnyFunction" + "name": "AnyFunction", + "qualifiedName": "AnyFunction", + "package": "typedoc" } } ], @@ -1262,7 +1312,9 @@ { "type": "reference", "id": 12, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ], "name": "ReturnType", @@ -1324,11 +1376,15 @@ "queryType": { "type": "reference", "id": 51, - "name": "Mixin3" + "name": "Mixin3", + "qualifiedName": "Mixin3", + "package": "typedoc" } } ], - "name": "Mixin" + "name": "Mixin", + "qualifiedName": "Mixin", + "package": "typedoc" } }, { @@ -1374,10 +1430,14 @@ { "type": "reference", "id": 13, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ], - "name": "AnyConstructor" + "name": "AnyConstructor", + "qualifiedName": "AnyConstructor", + "package": "typedoc" } } ], @@ -1391,7 +1451,9 @@ "type": { "type": "reference", "id": 21, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -1422,7 +1484,9 @@ "name": "any" } ], - "name": "Mixin1Class" + "name": "Mixin1Class", + "qualifiedName": "Mixin1Class", + "package": "typedoc" } } ], @@ -1447,7 +1511,9 @@ { "type": "reference", "id": 21, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ] } @@ -1500,17 +1566,23 @@ { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" }, { "type": "reference", "id": 13, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] } ], - "name": "AnyConstructor" + "name": "AnyConstructor", + "qualifiedName": "AnyConstructor", + "package": "typedoc" } } ], @@ -1524,7 +1596,9 @@ "type": { "type": "reference", "id": 35, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -1555,7 +1629,9 @@ "name": "any" } ], - "name": "Mixin2" + "name": "Mixin2", + "qualifiedName": "Mixin2", + "package": "typedoc" } } ], @@ -1580,7 +1656,9 @@ { "type": "reference", "id": 35, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ] } @@ -1638,7 +1716,9 @@ "name": "object" } ], - "name": "AnyConstructor" + "name": "AnyConstructor", + "qualifiedName": "AnyConstructor", + "package": "typedoc" } } ], @@ -1652,7 +1732,9 @@ "type": { "type": "reference", "id": 53, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -1683,7 +1765,9 @@ "name": "any" } ], - "name": "Mixin3" + "name": "Mixin3", + "qualifiedName": "Mixin3", + "package": "typedoc" } } ], @@ -1708,7 +1792,9 @@ { "type": "reference", "id": 53, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ] } diff --git a/src/test/converter/react/specs.json b/src/test/converter/react/specs.json index c4e75e425..ba7fbc698 100644 --- a/src/test/converter/react/specs.json +++ b/src/test/converter/react/specs.json @@ -43,14 +43,18 @@ "type": { "type": "reference", "id": 1, - "name": "DemoProps" + "name": "DemoProps", + "qualifiedName": "DemoProps", + "package": "typedoc" } } ], "type": { "type": "reference", "id": 4, - "name": "Demo" + "name": "Demo", + "qualifiedName": "Demo", + "package": "typedoc" } } ] diff --git a/src/test/converter/types/specs.json b/src/test/converter/types/specs.json index 55eac7510..8da751824 100644 --- a/src/test/converter/types/specs.json +++ b/src/test/converter/types/specs.json @@ -87,7 +87,9 @@ "checkType": { "type": "reference", "id": 12, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" }, "extendsType": { "type": "tuple", @@ -114,7 +116,9 @@ }, "trueType": { "type": "reference", - "name": "S" + "name": "S", + "qualifiedName": "S", + "package": "typedoc" }, "falseType": { "type": "intrinsic", @@ -515,7 +519,9 @@ "target": { "type": "reference", "id": 35, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -528,12 +534,16 @@ "type": "indexedAccess", "indexType": { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "objectType": { "type": "reference", "id": 35, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, "nameType": { @@ -543,14 +553,18 @@ [ { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "" ], [ { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "" ] @@ -590,19 +604,25 @@ "target": { "type": "reference", "id": 33, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, "templateType": { "type": "indexedAccess", "indexType": { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "objectType": { "type": "reference", "id": 33, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } } @@ -647,7 +667,9 @@ "type": { "type": "reference", "id": 30, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -662,12 +684,16 @@ "type": "indexedAccess", "indexType": { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "objectType": { "type": "reference", "id": 30, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, "nameType": { @@ -677,14 +703,18 @@ [ { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "" ], [ { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "" ] @@ -734,7 +764,9 @@ "type": { "type": "reference", "id": 26, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -916,7 +948,9 @@ "queryType": { "type": "reference", "id": 41, - "name": "x" + "name": "x", + "qualifiedName": "x", + "package": "typedoc" } } }, @@ -1528,7 +1562,9 @@ "target": { "type": "reference", "id": 57, - "name": "C" + "name": "C", + "qualifiedName": "C", + "package": "typedoc" } } }, @@ -1765,12 +1801,16 @@ { "type": "reference", "id": 63, - "name": "FirstType" + "name": "FirstType", + "qualifiedName": "FirstType", + "package": "typedoc" }, { "type": "reference", "id": 65, - "name": "SecondType" + "name": "SecondType", + "qualifiedName": "SecondType", + "package": "typedoc" } ] } @@ -1807,12 +1847,16 @@ { "type": "reference", "id": 63, - "name": "FirstType" + "name": "FirstType", + "qualifiedName": "FirstType", + "package": "typedoc" }, { "type": "reference", "id": 67, - "name": "ThirdType" + "name": "ThirdType", + "qualifiedName": "ThirdType", + "package": "typedoc" } ] } @@ -1845,12 +1889,16 @@ { "type": "reference", "id": 63, - "name": "FirstType" + "name": "FirstType", + "qualifiedName": "FirstType", + "package": "typedoc" }, { "type": "reference", "id": 65, - "name": "SecondType" + "name": "SecondType", + "qualifiedName": "SecondType", + "package": "typedoc" } ] } diff --git a/src/test/converter/variables/specs.json b/src/test/converter/variables/specs.json index 75e00ff0c..44a202ebf 100644 --- a/src/test/converter/variables/specs.json +++ b/src/test/converter/variables/specs.json @@ -55,10 +55,14 @@ { "type": "reference", "id": 5, - "name": "T" + "name": "T", + "qualifiedName": "Array.T", + "package": "typedoc" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } } ] @@ -128,7 +132,9 @@ "type": { "type": "reference", "id": 9, - "name": "Foo" + "name": "Foo", + "qualifiedName": "Foo", + "package": "typedoc" } } ] @@ -182,7 +188,9 @@ "type": { "type": "reference", "id": 12, - "name": "FooList" + "name": "FooList", + "qualifiedName": "FooList", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", @@ -222,10 +230,14 @@ { "type": "reference", "id": 9, - "name": "Foo" + "name": "Foo", + "qualifiedName": "Foo", + "package": "typedoc" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } ] }, @@ -276,7 +288,9 @@ "name": "string" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } }, { @@ -332,7 +346,9 @@ "name": "number" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" }, "defaultValue": "{}" } diff --git a/src/test/converter/variables/specs.nodoc.json b/src/test/converter/variables/specs.nodoc.json index 34a994392..7a4a09211 100644 --- a/src/test/converter/variables/specs.nodoc.json +++ b/src/test/converter/variables/specs.nodoc.json @@ -103,10 +103,14 @@ { "type": "reference", "id": 9, - "name": "Foo" + "name": "Foo", + "qualifiedName": "Foo", + "package": "typedoc" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } ] }, @@ -157,7 +161,9 @@ "name": "string" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } }, { @@ -213,7 +219,9 @@ "name": "number" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" }, "defaultValue": "{}" }