diff --git a/src/lib/models/types.ts b/src/lib/models/types.ts index c0f531221..a9cd478f2 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"; @@ -839,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] @@ -847,18 +850,22 @@ export class ReferenceType extends Type { .fileName.replace(/\\/g, "/"); if (!symbolPath) return ref; + // Attempt to decide package name from path if it contains "node_modules" let startIndex = symbolPath.lastIndexOf("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); + 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; } - const packageName = symbolPath.substring(startIndex, stopIndex); - ref.package = packageName; - + // Otherwise, look for a "package.json" file in a parent path + ref.package = findPackageForPath(symbolPath); return ref; } @@ -887,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; } } @@ -1287,3 +1289,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; + } + } +} diff --git a/src/lib/serialization/schema.ts b/src/lib/serialization/schema.ts index 350d6e4cf..93fb5cc21 100644 --- a/src/lib/serialization/schema.ts +++ b/src/lib/serialization/schema.ts @@ -241,9 +241,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 67369d841..c636eedc1 100644 --- a/src/test/converter/alias/specs.json +++ b/src/test/converter/alias/specs.json @@ -38,7 +38,9 @@ "checkType": { "type": "reference", "id": 9, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" }, "extendsType": { "type": "intrinsic", @@ -88,7 +90,9 @@ "checkType": { "type": "reference", "id": 11, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" }, "extendsType": { "type": "reference", @@ -104,12 +108,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" } } }, @@ -172,7 +180,9 @@ "type": { "type": "reference", "id": 6, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -183,7 +193,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 7f17627f9..9b42be000 100644 --- a/src/test/converter/class/specs-with-lump-categories.json +++ b/src/test/converter/class/specs-with-lump-categories.json @@ -512,7 +512,9 @@ "type": { "type": "reference", "id": 85, - "name": "Abstract" + "name": "Abstract", + "qualifiedName": "Abstract", + "package": "typedoc" } } ] @@ -589,7 +591,9 @@ "type": { "type": "reference", "id": 74, - "name": "ComputedNames" + "name": "ComputedNames", + "qualifiedName": "ComputedNames", + "package": "typedoc" } } ] @@ -719,7 +723,9 @@ "type": { "type": "reference", "id": 62, - "name": "TestAbstractClass" + "name": "TestAbstractClass", + "qualifiedName": "TestAbstractClass", + "package": "typedoc" } } ] @@ -806,7 +812,8 @@ { "type": "reference", "id": 68, - "name": "TestAbstractClassImplementation" + "name": "TestAbstractClassImplementation", + "qualifiedName": "TestAbstractClassImplementation" } ] }, @@ -830,19 +837,23 @@ "type": { "type": "reference", "id": 68, - "name": "TestAbstractClassImplementation" + "name": "TestAbstractClassImplementation", + "qualifiedName": "TestAbstractClassImplementation", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", "id": 64, - "name": "TestAbstractClass.constructor" + "name": "TestAbstractClass.constructor", + "qualifiedName": "TestAbstractClass.constructor" } } ], "inheritedFrom": { "type": "reference", "id": 63, - "name": "TestAbstractClass.constructor" + "name": "TestAbstractClass.constructor", + "qualifiedName": "TestAbstractClass.constructor" } }, { @@ -865,7 +876,8 @@ "overwrites": { "type": "reference", "id": 65, - "name": "TestAbstractClass.myAbstractProperty" + "name": "TestAbstractClass.myAbstractProperty", + "qualifiedName": "TestAbstractClass.myAbstractProperty" } }, { @@ -896,14 +908,16 @@ "overwrites": { "type": "reference", "id": 67, - "name": "TestAbstractClass.myAbstractMethod" + "name": "TestAbstractClass.myAbstractMethod", + "qualifiedName": "TestAbstractClass.myAbstractMethod" } } ], "overwrites": { "type": "reference", "id": 66, - "name": "TestAbstractClass.myAbstractMethod" + "name": "TestAbstractClass.myAbstractMethod", + "qualifiedName": "TestAbstractClass.myAbstractMethod" } } ], @@ -939,7 +953,9 @@ { "type": "reference", "id": 62, - "name": "TestAbstractClass" + "name": "TestAbstractClass", + "qualifiedName": "TestAbstractClass", + "package": "typedoc" } ] }, @@ -1004,7 +1020,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } ] @@ -1094,7 +1112,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } }, { @@ -1342,7 +1362,8 @@ { "type": "reference", "id": 38, - "name": "TestSubClass" + "name": "TestSubClass", + "qualifiedName": "TestSubClass" } ] }, @@ -1481,19 +1502,23 @@ "type": { "type": "reference", "id": 38, - "name": "TestSubClass" + "name": "TestSubClass", + "qualifiedName": "TestSubClass", + "package": "typedoc" }, "overwrites": { "type": "reference", "id": 27, - "name": "TestClass.constructor" + "name": "TestClass.constructor", + "qualifiedName": "TestClass.constructor" } } ], "overwrites": { "type": "reference", "id": 26, - "name": "TestClass.constructor" + "name": "TestClass.constructor", + "qualifiedName": "TestClass.constructor" } }, { @@ -1566,7 +1591,8 @@ "inheritedFrom": { "type": "reference", "id": 28, - "name": "TestClass.publicProperty" + "name": "TestClass.publicProperty", + "qualifiedName": "TestClass.publicProperty" } }, { @@ -1595,12 +1621,15 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", "id": 23, - "name": "TestClass.staticProperty" + "name": "TestClass.staticProperty", + "qualifiedName": "TestClass.staticProperty" } }, { @@ -1637,14 +1666,16 @@ "inheritedFrom": { "type": "reference", "id": 37, - "name": "TestClass.arrowMethod" + "name": "TestClass.arrowMethod", + "qualifiedName": "TestClass.arrowMethod" } } ], "inheritedFrom": { "type": "reference", "id": 36, - "name": "TestClass.arrowMethod" + "name": "TestClass.arrowMethod", + "qualifiedName": "TestClass.arrowMethod" } }, { @@ -1717,14 +1748,16 @@ "overwrites": { "type": "reference", "id": 33, - "name": "TestClass.protectedMethod" + "name": "TestClass.protectedMethod", + "qualifiedName": "TestClass.protectedMethod" } } ], "overwrites": { "type": "reference", "id": 32, - "name": "TestClass.protectedMethod" + "name": "TestClass.protectedMethod", + "qualifiedName": "TestClass.protectedMethod" } }, { @@ -1763,14 +1796,16 @@ "overwrites": { "type": "reference", "id": 31, - "name": "TestClass.publicMethod" + "name": "TestClass.publicMethod", + "qualifiedName": "TestClass.publicMethod" } } ], "overwrites": { "type": "reference", "id": 30, - "name": "TestClass.publicMethod" + "name": "TestClass.publicMethod", + "qualifiedName": "TestClass.publicMethod" } }, { @@ -1809,14 +1844,16 @@ "inheritedFrom": { "type": "reference", "id": 25, - "name": "TestClass.staticMethod" + "name": "TestClass.staticMethod", + "qualifiedName": "TestClass.staticMethod" } } ], "inheritedFrom": { "type": "reference", "id": 24, - "name": "TestClass.staticMethod" + "name": "TestClass.staticMethod", + "qualifiedName": "TestClass.staticMethod" } } ], @@ -1871,7 +1908,9 @@ { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } ] }, @@ -1895,7 +1934,9 @@ "type": { "type": "reference", "id": 81, - "name": "Ts38PrivateFields" + "name": "Ts38PrivateFields", + "qualifiedName": "Ts38PrivateFields", + "package": "typedoc" } } ] @@ -1992,7 +2033,9 @@ "type": { "type": "reference", "id": 85, - "name": "Abstract" + "name": "Abstract", + "qualifiedName": "Abstract", + "package": "typedoc" } } ] @@ -2133,7 +2176,9 @@ "type": { "type": "reference", "id": 94, - "name": "Vector2" + "name": "Vector2", + "qualifiedName": "Vector2", + "package": "typedoc" } } ] @@ -2227,7 +2272,8 @@ { "type": "reference", "id": 103, - "name": "Vector3" + "name": "Vector3", + "qualifiedName": "Vector3" } ] }, @@ -2341,19 +2387,23 @@ "type": { "type": "reference", "id": 103, - "name": "Vector3" + "name": "Vector3", + "qualifiedName": "Vector3", + "package": "typedoc" }, "overwrites": { "type": "reference", "id": 96, - "name": "Vector2.constructor" + "name": "Vector2.constructor", + "qualifiedName": "Vector2.constructor" } } ], "overwrites": { "type": "reference", "id": 95, - "name": "Vector2.constructor" + "name": "Vector2.constructor", + "qualifiedName": "Vector2.constructor" } }, { @@ -2378,7 +2428,8 @@ "inheritedFrom": { "type": "reference", "id": 102, - "name": "Vector2.name" + "name": "Vector2.name", + "qualifiedName": "Vector2.name" } }, { @@ -2403,7 +2454,8 @@ "inheritedFrom": { "type": "reference", "id": 100, - "name": "Vector2.x" + "name": "Vector2.x", + "qualifiedName": "Vector2.x" } }, { @@ -2428,7 +2480,8 @@ "inheritedFrom": { "type": "reference", "id": 101, - "name": "Vector2.y" + "name": "Vector2.y", + "qualifiedName": "Vector2.y" } }, { @@ -2481,7 +2534,9 @@ { "type": "reference", "id": 94, - "name": "Vector2" + "name": "Vector2", + "qualifiedName": "Vector2", + "package": "typedoc" } ] } @@ -2538,7 +2593,9 @@ "type": { "type": "reference", "id": 128, - "name": "DecoratedClass" + "name": "DecoratedClass", + "qualifiedName": "DecoratedClass", + "package": "typedoc" } } ] @@ -2899,7 +2956,9 @@ "type": { "type": "reference", "id": 161, - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "EventDispatcher", + "package": "typedoc" } } ] @@ -3520,7 +3579,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ], @@ -3531,10 +3592,14 @@ { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } } ] @@ -3565,7 +3630,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } }, { @@ -3596,7 +3663,9 @@ "elementType": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } }, @@ -3641,7 +3710,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ] @@ -3696,7 +3767,8 @@ { "type": "reference", "id": 176, - "name": "NonGenericClass" + "name": "NonGenericClass", + "qualifiedName": "NonGenericClass" } ] }, @@ -3764,19 +3836,23 @@ "type": { "type": "reference", "id": 176, - "name": "NonGenericClass" + "name": "NonGenericClass", + "qualifiedName": "NonGenericClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", "id": 168, - "name": "GenericClass.constructor" + "name": "GenericClass.constructor", + "qualifiedName": "GenericClass.constructor" } } ], "inheritedFrom": { "type": "reference", "id": 167, - "name": "GenericClass.constructor" + "name": "GenericClass.constructor", + "qualifiedName": "GenericClass.constructor" } }, { @@ -3809,7 +3885,8 @@ "inheritedFrom": { "type": "reference", "id": 171, - "name": "GenericClass.value" + "name": "GenericClass.value", + "qualifiedName": "GenericClass.value" } }, { @@ -3845,7 +3922,8 @@ "inheritedFrom": { "type": "reference", "id": 172, - "name": "GenericClass.values" + "name": "GenericClass.values", + "qualifiedName": "GenericClass.values" } }, { @@ -3893,14 +3971,16 @@ "inheritedFrom": { "type": "reference", "id": 174, - "name": "GenericClass.getValue" + "name": "GenericClass.getValue", + "qualifiedName": "GenericClass.getValue" } } ], "inheritedFrom": { "type": "reference", "id": 173, - "name": "GenericClass.getValue" + "name": "GenericClass.getValue", + "qualifiedName": "GenericClass.getValue" } } ], @@ -3943,7 +4023,9 @@ "name": "string" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } ] } @@ -3992,7 +4074,9 @@ "type": { "type": "reference", "id": 185, - "name": "GetterSetter" + "name": "GetterSetter", + "qualifiedName": "GetterSetter", + "package": "typedoc" } } ] @@ -4213,7 +4297,9 @@ "type": { "type": "reference", "id": 199, - "name": "ChainClass" + "name": "ChainClass", + "qualifiedName": "ChainClass", + "package": "typedoc" } } ] @@ -4250,7 +4336,9 @@ "type": { "type": "reference", "id": 199, - "name": "ChainClass" + "name": "ChainClass", + "qualifiedName": "ChainClass", + "package": "typedoc" } } ] @@ -4332,7 +4420,9 @@ "target": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } } @@ -4344,10 +4434,14 @@ { "type": "reference", "id": 213, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } } ] @@ -4368,7 +4462,9 @@ "type": { "type": "reference", "id": 213, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ], @@ -4406,7 +4502,9 @@ "target": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } } @@ -4457,7 +4555,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 0c98222fe..12bf6c25c 100644 --- a/src/test/converter/class/specs.json +++ b/src/test/converter/class/specs.json @@ -512,7 +512,9 @@ "type": { "type": "reference", "id": 85, - "name": "Abstract" + "name": "Abstract", + "qualifiedName": "Abstract", + "package": "typedoc" } } ] @@ -589,7 +591,9 @@ "type": { "type": "reference", "id": 74, - "name": "ComputedNames" + "name": "ComputedNames", + "qualifiedName": "ComputedNames", + "package": "typedoc" } } ] @@ -719,7 +723,9 @@ "type": { "type": "reference", "id": 62, - "name": "TestAbstractClass" + "name": "TestAbstractClass", + "qualifiedName": "TestAbstractClass", + "package": "typedoc" } } ] @@ -806,7 +812,8 @@ { "type": "reference", "id": 68, - "name": "TestAbstractClassImplementation" + "name": "TestAbstractClassImplementation", + "qualifiedName": "TestAbstractClassImplementation" } ] }, @@ -830,19 +837,23 @@ "type": { "type": "reference", "id": 68, - "name": "TestAbstractClassImplementation" + "name": "TestAbstractClassImplementation", + "qualifiedName": "TestAbstractClassImplementation", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", "id": 64, - "name": "TestAbstractClass.constructor" + "name": "TestAbstractClass.constructor", + "qualifiedName": "TestAbstractClass.constructor" } } ], "inheritedFrom": { "type": "reference", "id": 63, - "name": "TestAbstractClass.constructor" + "name": "TestAbstractClass.constructor", + "qualifiedName": "TestAbstractClass.constructor" } }, { @@ -865,7 +876,8 @@ "overwrites": { "type": "reference", "id": 65, - "name": "TestAbstractClass.myAbstractProperty" + "name": "TestAbstractClass.myAbstractProperty", + "qualifiedName": "TestAbstractClass.myAbstractProperty" } }, { @@ -896,14 +908,16 @@ "overwrites": { "type": "reference", "id": 67, - "name": "TestAbstractClass.myAbstractMethod" + "name": "TestAbstractClass.myAbstractMethod", + "qualifiedName": "TestAbstractClass.myAbstractMethod" } } ], "overwrites": { "type": "reference", "id": 66, - "name": "TestAbstractClass.myAbstractMethod" + "name": "TestAbstractClass.myAbstractMethod", + "qualifiedName": "TestAbstractClass.myAbstractMethod" } } ], @@ -939,7 +953,9 @@ { "type": "reference", "id": 62, - "name": "TestAbstractClass" + "name": "TestAbstractClass", + "qualifiedName": "TestAbstractClass", + "package": "typedoc" } ] }, @@ -1004,7 +1020,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } ] @@ -1094,7 +1112,9 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } }, { @@ -1338,7 +1358,8 @@ { "type": "reference", "id": 38, - "name": "TestSubClass" + "name": "TestSubClass", + "qualifiedName": "TestSubClass" } ] }, @@ -1477,19 +1498,23 @@ "type": { "type": "reference", "id": 38, - "name": "TestSubClass" + "name": "TestSubClass", + "qualifiedName": "TestSubClass", + "package": "typedoc" }, "overwrites": { "type": "reference", "id": 27, - "name": "TestClass.constructor" + "name": "TestClass.constructor", + "qualifiedName": "TestClass.constructor" } } ], "overwrites": { "type": "reference", "id": 26, - "name": "TestClass.constructor" + "name": "TestClass.constructor", + "qualifiedName": "TestClass.constructor" } }, { @@ -1562,7 +1587,8 @@ "inheritedFrom": { "type": "reference", "id": 28, - "name": "TestClass.publicProperty" + "name": "TestClass.publicProperty", + "qualifiedName": "TestClass.publicProperty" } }, { @@ -1591,12 +1617,15 @@ "type": { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", "id": 23, - "name": "TestClass.staticProperty" + "name": "TestClass.staticProperty", + "qualifiedName": "TestClass.staticProperty" } }, { @@ -1633,14 +1662,16 @@ "inheritedFrom": { "type": "reference", "id": 37, - "name": "TestClass.arrowMethod" + "name": "TestClass.arrowMethod", + "qualifiedName": "TestClass.arrowMethod" } } ], "inheritedFrom": { "type": "reference", "id": 36, - "name": "TestClass.arrowMethod" + "name": "TestClass.arrowMethod", + "qualifiedName": "TestClass.arrowMethod" } }, { @@ -1713,14 +1744,16 @@ "overwrites": { "type": "reference", "id": 33, - "name": "TestClass.protectedMethod" + "name": "TestClass.protectedMethod", + "qualifiedName": "TestClass.protectedMethod" } } ], "overwrites": { "type": "reference", "id": 32, - "name": "TestClass.protectedMethod" + "name": "TestClass.protectedMethod", + "qualifiedName": "TestClass.protectedMethod" } }, { @@ -1759,14 +1792,16 @@ "overwrites": { "type": "reference", "id": 31, - "name": "TestClass.publicMethod" + "name": "TestClass.publicMethod", + "qualifiedName": "TestClass.publicMethod" } } ], "overwrites": { "type": "reference", "id": 30, - "name": "TestClass.publicMethod" + "name": "TestClass.publicMethod", + "qualifiedName": "TestClass.publicMethod" } }, { @@ -1805,14 +1840,16 @@ "inheritedFrom": { "type": "reference", "id": 25, - "name": "TestClass.staticMethod" + "name": "TestClass.staticMethod", + "qualifiedName": "TestClass.staticMethod" } } ], "inheritedFrom": { "type": "reference", "id": 24, - "name": "TestClass.staticMethod" + "name": "TestClass.staticMethod", + "qualifiedName": "TestClass.staticMethod" } } ], @@ -1867,7 +1904,9 @@ { "type": "reference", "id": 22, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } ] }, @@ -1891,7 +1930,9 @@ "type": { "type": "reference", "id": 81, - "name": "Ts38PrivateFields" + "name": "Ts38PrivateFields", + "qualifiedName": "Ts38PrivateFields", + "package": "typedoc" } } ] @@ -1988,7 +2029,9 @@ "type": { "type": "reference", "id": 85, - "name": "Abstract" + "name": "Abstract", + "qualifiedName": "Abstract", + "package": "typedoc" } } ] @@ -2129,7 +2172,9 @@ "type": { "type": "reference", "id": 94, - "name": "Vector2" + "name": "Vector2", + "qualifiedName": "Vector2", + "package": "typedoc" } } ] @@ -2223,7 +2268,8 @@ { "type": "reference", "id": 103, - "name": "Vector3" + "name": "Vector3", + "qualifiedName": "Vector3" } ] }, @@ -2337,19 +2383,23 @@ "type": { "type": "reference", "id": 103, - "name": "Vector3" + "name": "Vector3", + "qualifiedName": "Vector3", + "package": "typedoc" }, "overwrites": { "type": "reference", "id": 96, - "name": "Vector2.constructor" + "name": "Vector2.constructor", + "qualifiedName": "Vector2.constructor" } } ], "overwrites": { "type": "reference", "id": 95, - "name": "Vector2.constructor" + "name": "Vector2.constructor", + "qualifiedName": "Vector2.constructor" } }, { @@ -2374,7 +2424,8 @@ "inheritedFrom": { "type": "reference", "id": 102, - "name": "Vector2.name" + "name": "Vector2.name", + "qualifiedName": "Vector2.name" } }, { @@ -2399,7 +2450,8 @@ "inheritedFrom": { "type": "reference", "id": 100, - "name": "Vector2.x" + "name": "Vector2.x", + "qualifiedName": "Vector2.x" } }, { @@ -2424,7 +2476,8 @@ "inheritedFrom": { "type": "reference", "id": 101, - "name": "Vector2.y" + "name": "Vector2.y", + "qualifiedName": "Vector2.y" } }, { @@ -2477,7 +2530,9 @@ { "type": "reference", "id": 94, - "name": "Vector2" + "name": "Vector2", + "qualifiedName": "Vector2", + "package": "typedoc" } ] } @@ -2534,7 +2589,9 @@ "type": { "type": "reference", "id": 128, - "name": "DecoratedClass" + "name": "DecoratedClass", + "qualifiedName": "DecoratedClass", + "package": "typedoc" } } ] @@ -2895,7 +2952,9 @@ "type": { "type": "reference", "id": 161, - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "EventDispatcher", + "package": "typedoc" } } ] @@ -3516,7 +3575,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ], @@ -3527,10 +3588,14 @@ { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } } ] @@ -3561,7 +3626,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } }, { @@ -3592,7 +3659,9 @@ "elementType": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } }, @@ -3637,7 +3706,9 @@ "type": { "type": "reference", "id": 169, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ] @@ -3692,7 +3763,8 @@ { "type": "reference", "id": 176, - "name": "NonGenericClass" + "name": "NonGenericClass", + "qualifiedName": "NonGenericClass" } ] }, @@ -3760,19 +3832,23 @@ "type": { "type": "reference", "id": 176, - "name": "NonGenericClass" + "name": "NonGenericClass", + "qualifiedName": "NonGenericClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", "id": 168, - "name": "GenericClass.constructor" + "name": "GenericClass.constructor", + "qualifiedName": "GenericClass.constructor" } } ], "inheritedFrom": { "type": "reference", "id": 167, - "name": "GenericClass.constructor" + "name": "GenericClass.constructor", + "qualifiedName": "GenericClass.constructor" } }, { @@ -3805,7 +3881,8 @@ "inheritedFrom": { "type": "reference", "id": 171, - "name": "GenericClass.value" + "name": "GenericClass.value", + "qualifiedName": "GenericClass.value" } }, { @@ -3841,7 +3918,8 @@ "inheritedFrom": { "type": "reference", "id": 172, - "name": "GenericClass.values" + "name": "GenericClass.values", + "qualifiedName": "GenericClass.values" } }, { @@ -3889,14 +3967,16 @@ "inheritedFrom": { "type": "reference", "id": 174, - "name": "GenericClass.getValue" + "name": "GenericClass.getValue", + "qualifiedName": "GenericClass.getValue" } } ], "inheritedFrom": { "type": "reference", "id": 173, - "name": "GenericClass.getValue" + "name": "GenericClass.getValue", + "qualifiedName": "GenericClass.getValue" } } ], @@ -3939,7 +4019,9 @@ "name": "string" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } ] } @@ -3988,7 +4070,9 @@ "type": { "type": "reference", "id": 185, - "name": "GetterSetter" + "name": "GetterSetter", + "qualifiedName": "GetterSetter", + "package": "typedoc" } } ] @@ -4209,7 +4293,9 @@ "type": { "type": "reference", "id": 199, - "name": "ChainClass" + "name": "ChainClass", + "qualifiedName": "ChainClass", + "package": "typedoc" } } ] @@ -4246,7 +4332,9 @@ "type": { "type": "reference", "id": 199, - "name": "ChainClass" + "name": "ChainClass", + "qualifiedName": "ChainClass", + "package": "typedoc" } } ] @@ -4328,7 +4416,9 @@ "target": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } } @@ -4340,10 +4430,14 @@ { "type": "reference", "id": 213, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } ], - "name": "GenericClass" + "name": "GenericClass", + "qualifiedName": "GenericClass", + "package": "typedoc" } } ] @@ -4364,7 +4458,9 @@ "type": { "type": "reference", "id": 213, - "name": "T" + "name": "T", + "qualifiedName": "GenericClass.T", + "package": "typedoc" } } ], @@ -4402,7 +4498,9 @@ "target": { "type": "reference", "id": 205, - "name": "TestClass" + "name": "TestClass", + "qualifiedName": "TestClass", + "package": "typedoc" } } } @@ -4453,7 +4551,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 c27b5a777..51285e216 100644 --- a/src/test/converter/comment/specs.json +++ b/src/test/converter/comment/specs.json @@ -57,7 +57,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 2ffd5f610..a74037bb7 100644 --- a/src/test/converter/declaration/specs.json +++ b/src/test/converter/declaration/specs.json @@ -30,7 +30,9 @@ "type": { "type": "reference", "id": 2, - "name": "Decl" + "name": "Decl", + "qualifiedName": "Decl", + "package": "typedoc" } } ] @@ -147,7 +149,9 @@ "type": { "type": "reference", "id": 8, - "name": "Exported" + "name": "Exported", + "qualifiedName": "Exported", + "package": "typedoc" } } ] @@ -190,7 +194,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 77ea2ccc7..3315ed579 100644 --- a/src/test/converter/exports/specs.json +++ b/src/test/converter/exports/specs.json @@ -168,7 +168,9 @@ "type": { "type": "reference", "id": 29, - "name": "GH1453Helper" + "name": "GH1453Helper", + "qualifiedName": "GH1453Helper", + "package": "typedoc" } }, { @@ -210,7 +212,9 @@ "type": { "type": "reference", "id": 29, - "name": "__module" + "name": "__module", + "qualifiedName": "__module", + "package": "typedoc" }, "defaultValue": "Mod" }, @@ -232,7 +236,9 @@ "type": { "type": "reference", "id": 29, - "name": "a" + "name": "a", + "qualifiedName": "a", + "package": "typedoc" }, "defaultValue": "Mod.a" }, @@ -254,7 +260,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 6cd3fcff2..4b99781e9 100644 --- a/src/test/converter/function/specs.json +++ b/src/test/converter/function/specs.json @@ -225,7 +225,9 @@ "type": { "type": "reference", "id": 86, - "name": "Predicates" + "name": "Predicates", + "qualifiedName": "Predicates", + "package": "typedoc" } } ] @@ -476,7 +478,9 @@ "type": { "type": "reference", "id": 101, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -500,7 +504,9 @@ { "type": "reference", "id": 101, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ], "name": "Iterable", @@ -571,7 +577,9 @@ "type": { "type": "reference", "id": 108, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -618,7 +626,9 @@ { "type": "reference", "id": 108, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ], "name": "Iterable", @@ -693,7 +703,9 @@ { "type": "reference", "id": 69, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ] } @@ -706,7 +718,9 @@ "targetType": { "type": "reference", "id": 69, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } } @@ -1831,7 +1845,9 @@ { "type": "reference", "id": 73, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ] } @@ -1844,7 +1860,9 @@ "targetType": { "type": "reference", "id": 73, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } } @@ -2277,7 +2295,9 @@ "type": { "type": "reference", "id": 123, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -2298,7 +2318,9 @@ "elementType": { "type": "reference", "id": 123, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } } @@ -2308,7 +2330,9 @@ "elementType": { "type": "reference", "id": 123, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } } @@ -2366,14 +2390,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" } } ] @@ -2455,14 +2483,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" } } ] @@ -2597,7 +2629,9 @@ "type": { "type": "reference", "id": 139, - "name": "BreakpointRange" + "name": "BreakpointRange", + "qualifiedName": "BreakpointRange", + "package": "typedoc" } }, { @@ -2616,7 +2650,9 @@ "type": { "type": "reference", "id": 139, - "name": "BreakpointRange" + "name": "BreakpointRange", + "qualifiedName": "BreakpointRange", + "package": "typedoc" } }, { @@ -2635,7 +2671,9 @@ "type": { "type": "reference", "id": 139, - "name": "BreakpointRange" + "name": "BreakpointRange", + "qualifiedName": "BreakpointRange", + "package": "typedoc" } }, { @@ -2654,7 +2692,9 @@ "type": { "type": "reference", "id": 139, - "name": "BreakpointRange" + "name": "BreakpointRange", + "qualifiedName": "BreakpointRange", + "package": "typedoc" } }, { @@ -2673,7 +2713,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 a2dffa498..343732d28 100644 --- a/src/test/converter/inherit-param-doc/specs.json +++ b/src/test/converter/inherit-param-doc/specs.json @@ -24,7 +24,9 @@ "type": { "type": "reference", "id": 6, - "name": "Class1" + "name": "Class1", + "qualifiedName": "Class1", + "package": "typedoc" } } ] @@ -93,14 +95,16 @@ "implementationOf": { "type": "reference", "id": 3, - "name": "Base.method1" + "name": "Base.method1", + "qualifiedName": "Base.method1" } } ], "implementationOf": { "type": "reference", "id": 2, - "name": "Base.method1" + "name": "Base.method1", + "qualifiedName": "Base.method1" } } ], @@ -130,7 +134,9 @@ { "type": "reference", "id": 1, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] }, @@ -154,7 +160,9 @@ "type": { "type": "reference", "id": 13, - "name": "Class2" + "name": "Class2", + "qualifiedName": "Class2", + "package": "typedoc" } } ] @@ -223,14 +231,16 @@ "implementationOf": { "type": "reference", "id": 3, - "name": "Base.method1" + "name": "Base.method1", + "qualifiedName": "Base.method1" } } ], "implementationOf": { "type": "reference", "id": 2, - "name": "Base.method1" + "name": "Base.method1", + "qualifiedName": "Base.method1" } } ], @@ -260,7 +270,9 @@ { "type": "reference", "id": 1, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] }, @@ -284,7 +296,9 @@ "type": { "type": "reference", "id": 20, - "name": "Class3" + "name": "Class3", + "qualifiedName": "Class3", + "package": "typedoc" } } ] @@ -353,14 +367,16 @@ "implementationOf": { "type": "reference", "id": 3, - "name": "Base.method1" + "name": "Base.method1", + "qualifiedName": "Base.method1" } } ], "implementationOf": { "type": "reference", "id": 2, - "name": "Base.method1" + "name": "Base.method1", + "qualifiedName": "Base.method1" } } ], @@ -390,7 +406,9 @@ { "type": "reference", "id": 1, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] }, @@ -485,17 +503,20 @@ { "type": "reference", "id": 6, - "name": "Class1" + "name": "Class1", + "qualifiedName": "Class1" }, { "type": "reference", "id": 13, - "name": "Class2" + "name": "Class2", + "qualifiedName": "Class2" }, { "type": "reference", "id": 20, - "name": "Class3" + "name": "Class3", + "qualifiedName": "Class3" } ] } diff --git a/src/test/converter/inheritance/specs.json b/src/test/converter/inheritance/specs.json index b0d2a20b6..aa1ab8b35 100644 --- a/src/test/converter/inheritance/specs.json +++ b/src/test/converter/inheritance/specs.json @@ -60,7 +60,9 @@ "type": { "type": "reference", "id": 19, - "name": "T" + "name": "T", + "qualifiedName": "InterfaceSource.T", + "package": "typedoc" } }, { @@ -105,7 +107,9 @@ "type": { "type": "reference", "id": 19, - "name": "T" + "name": "T", + "qualifiedName": "InterfaceSource.T", + "package": "typedoc" } } ] @@ -188,7 +192,9 @@ "type": { "type": "reference", "id": 25, - "name": "T" + "name": "T", + "qualifiedName": "InterfaceTarget.T", + "package": "typedoc" } }, { @@ -233,7 +239,9 @@ "type": { "type": "reference", "id": 25, - "name": "T" + "name": "T", + "qualifiedName": "InterfaceTarget.T", + "package": "typedoc" } } ] @@ -367,7 +375,9 @@ "type": { "type": "reference", "id": 4, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -386,7 +396,9 @@ "type": { "type": "reference", "id": 4, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -539,7 +551,9 @@ "type": { "type": "reference", "id": 11, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -558,7 +572,9 @@ "type": { "type": "reference", "id": 11, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -630,17 +646,21 @@ "type": { "type": "reference", "id": 34, - "name": "MySubClass" + "name": "MySubClass", + "qualifiedName": "MySubClass", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", - "name": "My.constructor" + "name": "My.constructor", + "qualifiedName": "My.constructor" } } ], "inheritedFrom": { "type": "reference", - "name": "My.constructor" + "name": "My.constructor", + "qualifiedName": "My.constructor" } }, { @@ -662,7 +682,8 @@ }, "inheritedFrom": { "type": "reference", - "name": "My.instanceProp" + "name": "My.instanceProp", + "qualifiedName": "My.instanceProp" } }, { @@ -686,7 +707,8 @@ }, "inheritedFrom": { "type": "reference", - "name": "My.staticProp" + "name": "My.staticProp", + "qualifiedName": "My.staticProp" } } ], @@ -717,7 +739,9 @@ { "type": "reference", "id": 31, - "name": "My" + "name": "My", + "qualifiedName": "My", + "package": "typedoc" } ] }, @@ -797,7 +821,9 @@ "type": { "type": "reference", "id": 31, - "name": "My" + "name": "My", + "qualifiedName": "My", + "package": "typedoc" } } ] @@ -866,13 +892,16 @@ "type": { "type": "reference", "id": 27, - "name": "MyCtor" + "name": "MyCtor", + "qualifiedName": "MyCtor", + "package": "typedoc" }, "extendedBy": [ { "type": "reference", "id": 34, - "name": "MySubClass" + "name": "MySubClass", + "qualifiedName": "MySubClass" } ] } diff --git a/src/test/converter/interface/specs.json b/src/test/converter/interface/specs.json index 0b8aa85f3..bc7c792c0 100644 --- a/src/test/converter/interface/specs.json +++ b/src/test/converter/interface/specs.json @@ -92,7 +92,9 @@ "type": { "type": "reference", "id": 2, - "name": "Constructor" + "name": "Constructor", + "qualifiedName": "Constructor", + "package": "typedoc" } }, { @@ -125,7 +127,9 @@ "type": { "type": "reference", "id": 13, - "name": "Instance" + "name": "Instance", + "qualifiedName": "Instance", + "package": "typedoc" } } ] @@ -408,7 +412,9 @@ "type": { "type": "reference", "id": 30, - "name": "ClassImplementingEmptyInterface" + "name": "ClassImplementingEmptyInterface", + "qualifiedName": "ClassImplementingEmptyInterface", + "package": "typedoc" } } ] @@ -494,7 +500,9 @@ { "type": "reference", "id": 29, - "name": "EmptyInterface" + "name": "EmptyInterface", + "qualifiedName": "EmptyInterface", + "package": "typedoc" } ] }, @@ -523,7 +531,8 @@ { "type": "reference", "id": 30, - "name": "ClassImplementingEmptyInterface" + "name": "ClassImplementingEmptyInterface", + "qualifiedName": "ClassImplementingEmptyInterface" } ] } @@ -614,10 +623,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "Forms.EventDispatcher", + "package": "typedoc" } } ] @@ -646,10 +659,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } } }, @@ -685,10 +702,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "EventListener" + "name": "EventListener", + "qualifiedName": "Forms.EventListener", + "package": "typedoc" } }, { @@ -721,22 +742,28 @@ { "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", "id": 66, - "name": "EventDispatcherInt.add" + "name": "EventDispatcherInt.add", + "qualifiedName": "EventDispatcherInt.add" } } ], "implementationOf": { "type": "reference", "id": 65, - "name": "EventDispatcherInt.add" + "name": "EventDispatcherInt.add", + "qualifiedName": "EventDispatcherInt.add" } }, { @@ -765,14 +792,16 @@ "implementationOf": { "type": "reference", "id": 77, - "name": "EventDispatcherInt.clear" + "name": "EventDispatcherInt.clear", + "qualifiedName": "EventDispatcherInt.clear" } } ], "implementationOf": { "type": "reference", "id": 76, - "name": "EventDispatcherInt.clear" + "name": "EventDispatcherInt.clear", + "qualifiedName": "EventDispatcherInt.clear" } }, { @@ -803,7 +832,9 @@ "type": { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } } ], @@ -814,14 +845,16 @@ "implementationOf": { "type": "reference", "id": 74, - "name": "EventDispatcherInt.dispatch" + "name": "EventDispatcherInt.dispatch", + "qualifiedName": "EventDispatcherInt.dispatch" } } ], "implementationOf": { "type": "reference", "id": 73, - "name": "EventDispatcherInt.dispatch" + "name": "EventDispatcherInt.dispatch", + "qualifiedName": "EventDispatcherInt.dispatch" } }, { @@ -850,14 +883,16 @@ "implementationOf": { "type": "reference", "id": 79, - "name": "EventDispatcherInt.hasListeners" + "name": "EventDispatcherInt.hasListeners", + "qualifiedName": "EventDispatcherInt.hasListeners" } } ], "implementationOf": { "type": "reference", "id": 78, - "name": "EventDispatcherInt.hasListeners" + "name": "EventDispatcherInt.hasListeners", + "qualifiedName": "EventDispatcherInt.hasListeners" } }, { @@ -892,10 +927,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } } ], @@ -906,14 +945,16 @@ "implementationOf": { "type": "reference", "id": 71, - "name": "EventDispatcherInt.remove" + "name": "EventDispatcherInt.remove", + "qualifiedName": "EventDispatcherInt.remove" } } ], "implementationOf": { "type": "reference", "id": 70, - "name": "EventDispatcherInt.remove" + "name": "EventDispatcherInt.remove", + "qualifiedName": "EventDispatcherInt.remove" } } ], @@ -965,10 +1006,14 @@ { "type": "reference", "id": 84, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventDispatcher.T", + "package": "typedoc" } ], - "name": "EventDispatcherInt" + "name": "EventDispatcherInt", + "qualifiedName": "Forms.EventDispatcherInt", + "package": "typedoc" } ] }, @@ -1026,10 +1071,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "EventListener" + "name": "EventListener", + "qualifiedName": "Forms.EventListener", + "package": "typedoc" } }, { @@ -1064,10 +1113,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "Forms.EventDispatcher", + "package": "typedoc" } } ], @@ -1078,10 +1131,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "Subscription" + "name": "Subscription", + "qualifiedName": "Forms.Subscription", + "package": "typedoc" } } ] @@ -1108,10 +1165,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "Forms.EventDispatcher", + "package": "typedoc" } }, { @@ -1136,7 +1197,8 @@ "implementationOf": { "type": "reference", "id": 45, - "name": "SubscriptionInt.filter" + "name": "SubscriptionInt.filter", + "qualifiedName": "SubscriptionInt.filter" } }, { @@ -1161,15 +1223,20 @@ { "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", "id": 43, - "name": "SubscriptionInt.listener" + "name": "SubscriptionInt.listener", + "qualifiedName": "SubscriptionInt.listener" } }, { @@ -1194,7 +1261,8 @@ "implementationOf": { "type": "reference", "id": 44, - "name": "SubscriptionInt.priority" + "name": "SubscriptionInt.priority", + "qualifiedName": "SubscriptionInt.priority" } }, { @@ -1231,14 +1299,16 @@ "implementationOf": { "type": "reference", "id": 47, - "name": "SubscriptionInt.unsubscribe" + "name": "SubscriptionInt.unsubscribe", + "qualifiedName": "SubscriptionInt.unsubscribe" } } ], "implementationOf": { "type": "reference", "id": 46, - "name": "SubscriptionInt.unsubscribe" + "name": "SubscriptionInt.unsubscribe", + "qualifiedName": "SubscriptionInt.unsubscribe" } } ], @@ -1289,10 +1359,14 @@ { "type": "reference", "id": 52, - "name": "V" + "name": "V", + "qualifiedName": "Forms.Subscription.V", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } ] }, @@ -1342,10 +1416,14 @@ { "type": "reference", "id": 80, - "name": "U" + "name": "U", + "qualifiedName": "Forms.EventDispatcherInt.U", + "package": "typedoc" } ], - "name": "EventListener" + "name": "EventListener", + "qualifiedName": "Forms.EventListener", + "package": "typedoc" } }, { @@ -1380,10 +1458,14 @@ { "type": "reference", "id": 80, - "name": "U" + "name": "U", + "qualifiedName": "Forms.EventDispatcherInt.U", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } } ] @@ -1442,7 +1524,9 @@ "type": { "type": "reference", "id": 80, - "name": "U" + "name": "U", + "qualifiedName": "Forms.EventDispatcherInt.U", + "package": "typedoc" } } ], @@ -1511,10 +1595,14 @@ { "type": "reference", "id": 80, - "name": "U" + "name": "U", + "qualifiedName": "Forms.EventDispatcherInt.U", + "package": "typedoc" } ], - "name": "SubscriptionInt" + "name": "SubscriptionInt", + "qualifiedName": "Forms.SubscriptionInt", + "package": "typedoc" } } ], @@ -1558,7 +1646,8 @@ { "type": "reference", "id": 81, - "name": "EventDispatcher" + "name": "EventDispatcher", + "qualifiedName": "EventDispatcher" } ] }, @@ -1606,7 +1695,9 @@ "type": { "type": "reference", "id": 39, - "name": "T" + "name": "T", + "qualifiedName": "Forms.EventListener.T", + "package": "typedoc" } } ], @@ -1669,10 +1760,14 @@ { "type": "reference", "id": 48, - "name": "T" + "name": "T", + "qualifiedName": "Forms.SubscriptionInt.T", + "package": "typedoc" } ], - "name": "EventListener" + "name": "EventListener", + "qualifiedName": "Forms.EventListener", + "package": "typedoc" } }, { @@ -1764,7 +1859,8 @@ { "type": "reference", "id": 49, - "name": "Subscription" + "name": "Subscription", + "qualifiedName": "Subscription" } ] } @@ -1864,12 +1960,14 @@ { "type": "reference", "id": 107, - "name": "Child" + "name": "Child", + "qualifiedName": "Child" }, { "type": "reference", "id": 112, - "name": "Child2" + "name": "Child2", + "qualifiedName": "Child2" } ] }, @@ -1918,7 +2016,8 @@ { "type": "reference", "id": 107, - "name": "Child" + "name": "Child", + "qualifiedName": "Child" } ] }, @@ -1948,7 +2047,8 @@ "inheritedFrom": { "type": "reference", "id": 104, - "name": "Base.base" + "name": "Base.base", + "qualifiedName": "Base.base" } }, { @@ -1971,7 +2071,8 @@ "inheritedFrom": { "type": "reference", "id": 106, - "name": "Base2.base2" + "name": "Base2.base2", + "qualifiedName": "Base2.base2" } }, { @@ -2040,19 +2141,24 @@ { "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": [ { "type": "reference", "id": 112, - "name": "Child2" + "name": "Child2", + "qualifiedName": "Child2" } ] }, @@ -2082,7 +2188,8 @@ "inheritedFrom": { "type": "reference", "id": 104, - "name": "Base.base" + "name": "Base.base", + "qualifiedName": "Base.base" } }, { @@ -2105,7 +2212,8 @@ "inheritedFrom": { "type": "reference", "id": 111, - "name": "Child.base2" + "name": "Child.base2", + "qualifiedName": "Child.base2" } }, { @@ -2128,7 +2236,8 @@ "inheritedFrom": { "type": "reference", "id": 108, - "name": "Child.child" + "name": "Child.child", + "qualifiedName": "Child.child" } }, { @@ -2169,7 +2278,8 @@ "inheritedFrom": { "type": "reference", "id": 109, - "name": "Child.child3" + "name": "Child.child3", + "qualifiedName": "Child.child3" } } ], @@ -2197,12 +2307,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 74a009433..819be4272 100644 --- a/src/test/converter/js/specs.json +++ b/src/test/converter/js/specs.json @@ -449,7 +449,9 @@ "type": { "type": "reference", "id": 41, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -503,14 +505,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 dee0a061e..33988cfeb 100644 --- a/src/test/converter/mixin/specs.json +++ b/src/test/converter/mixin/specs.json @@ -32,7 +32,9 @@ "type": { "type": "reference", "id": 13, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } } ] @@ -140,17 +142,21 @@ "type": { "type": "reference", "id": 58, - "name": "SomeClassWithMixin" + "name": "SomeClassWithMixin", + "qualifiedName": "SomeClassWithMixin", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).constructor" + "name": "Mixin2(Mixin1Func(Base)).constructor", + "qualifiedName": "Mixin2(Mixin1Func(Base)).constructor" } } ], "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).constructor" + "name": "Mixin2(Mixin1Func(Base)).constructor", + "qualifiedName": "Mixin2(Mixin1Func(Base)).constructor" } }, { @@ -173,7 +179,8 @@ "defaultValue": "\"init\"", "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).baseProperty" + "name": "Mixin2(Mixin1Func(Base)).baseProperty", + "qualifiedName": "Mixin2(Mixin1Func(Base)).baseProperty" } }, { @@ -215,7 +222,8 @@ "defaultValue": "\"init\"", "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).property1" + "name": "Mixin2(Mixin1Func(Base)).property1", + "qualifiedName": "Mixin2(Mixin1Func(Base)).property1" } }, { @@ -238,7 +246,8 @@ "defaultValue": "\"init\"", "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).property2" + "name": "Mixin2(Mixin1Func(Base)).property2", + "qualifiedName": "Mixin2(Mixin1Func(Base)).property2" } }, { @@ -266,13 +275,15 @@ }, "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).baseMethod" + "name": "Mixin2(Mixin1Func(Base)).baseMethod", + "qualifiedName": "Mixin2(Mixin1Func(Base)).baseMethod" } } ], "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).baseMethod" + "name": "Mixin2(Mixin1Func(Base)).baseMethod", + "qualifiedName": "Mixin2(Mixin1Func(Base)).baseMethod" } }, { @@ -331,7 +342,9 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } } } @@ -341,18 +354,22 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } }, "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).method1" + "name": "Mixin2(Mixin1Func(Base)).method1", + "qualifiedName": "Mixin2(Mixin1Func(Base)).method1" } } ], "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).method1" + "name": "Mixin2(Mixin1Func(Base)).method1", + "qualifiedName": "Mixin2(Mixin1Func(Base)).method1" } }, { @@ -383,24 +400,30 @@ "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", - "name": "Mixin2(Mixin1Func(Base)).method2" + "name": "Mixin2(Mixin1Func(Base)).method2", + "qualifiedName": "Mixin2(Mixin1Func(Base)).method2" } } ], "inheritedFrom": { "type": "reference", - "name": "Mixin2(Mixin1Func(Base)).method2" + "name": "Mixin2(Mixin1Func(Base)).method2", + "qualifiedName": "Mixin2(Mixin1Func(Base)).method2" } } ], @@ -471,7 +494,9 @@ "name": "any" } ], - "name": "Mixin1Class" + "name": "Mixin1Class", + "qualifiedName": "Mixin1Class", + "package": "typedoc" } } ], @@ -498,7 +523,9 @@ "queryType": { "type": "reference", "id": 13, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } } ] @@ -508,7 +535,9 @@ "name": "this" } ], - "name": "Mixin2" + "name": "Mixin2", + "qualifiedName": "Mixin2", + "package": "typedoc" }, { "type": "reference", @@ -519,7 +548,9 @@ "queryType": { "type": "reference", "id": 13, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } }, { @@ -527,7 +558,9 @@ "name": "this" } ], - "name": "Mixin1Class" + "name": "Mixin1Class", + "qualifiedName": "Mixin1Class", + "package": "typedoc" }, { "type": "reference", @@ -538,7 +571,9 @@ "name": "this" } ], - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ] } @@ -578,7 +613,8 @@ "defaultValue": "\"init\"", "inheritedFrom": { "type": "reference", - "name": "Mixin.baseProperty" + "name": "Mixin.baseProperty", + "qualifiedName": "Mixin.baseProperty" } }, { @@ -601,7 +637,8 @@ "defaultValue": "\"init\"", "inheritedFrom": { "type": "reference", - "name": "Mixin.property1" + "name": "Mixin.property1", + "qualifiedName": "Mixin.property1" } }, { @@ -629,13 +666,15 @@ }, "inheritedFrom": { "type": "reference", - "name": "Mixin.baseMethod" + "name": "Mixin.baseMethod", + "qualifiedName": "Mixin.baseMethod" } } ], "inheritedFrom": { "type": "reference", - "name": "Mixin.baseMethod" + "name": "Mixin.baseMethod", + "qualifiedName": "Mixin.baseMethod" } }, { @@ -668,7 +707,9 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } } } @@ -678,18 +719,22 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } }, "inheritedFrom": { "type": "reference", - "name": "Mixin.method1" + "name": "Mixin.method1", + "qualifiedName": "Mixin.method1" } } ], "inheritedFrom": { "type": "reference", - "name": "Mixin.method1" + "name": "Mixin.method1", + "qualifiedName": "Mixin.method1" } } ], @@ -727,11 +772,15 @@ "queryType": { "type": "reference", "id": 19, - "name": "Mixin1Func" + "name": "Mixin1Func", + "qualifiedName": "Mixin1Func", + "package": "typedoc" } } ], - "name": "Mixin" + "name": "Mixin", + "qualifiedName": "Mixin", + "package": "typedoc" } ] }, @@ -769,7 +818,8 @@ "defaultValue": "\"init\"", "inheritedFrom": { "type": "reference", - "name": "Mixin.baseProperty" + "name": "Mixin.baseProperty", + "qualifiedName": "Mixin.baseProperty" } }, { @@ -792,7 +842,8 @@ "defaultValue": "\"init\"", "inheritedFrom": { "type": "reference", - "name": "Mixin.property1" + "name": "Mixin.property1", + "qualifiedName": "Mixin.property1" } }, { @@ -815,7 +866,8 @@ "defaultValue": "\"init\"", "inheritedFrom": { "type": "reference", - "name": "Mixin.property2" + "name": "Mixin.property2", + "qualifiedName": "Mixin.property2" } }, { @@ -843,13 +895,15 @@ }, "inheritedFrom": { "type": "reference", - "name": "Mixin.baseMethod" + "name": "Mixin.baseMethod", + "qualifiedName": "Mixin.baseMethod" } } ], "inheritedFrom": { "type": "reference", - "name": "Mixin.baseMethod" + "name": "Mixin.baseMethod", + "qualifiedName": "Mixin.baseMethod" } }, { @@ -882,7 +936,9 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } } } @@ -892,18 +948,22 @@ "elementType": { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type", + "package": "typedoc" } }, "inheritedFrom": { "type": "reference", - "name": "Mixin.method1" + "name": "Mixin.method1", + "qualifiedName": "Mixin.method1" } } ], "inheritedFrom": { "type": "reference", - "name": "Mixin.method1" + "name": "Mixin.method1", + "qualifiedName": "Mixin.method1" } }, { @@ -934,24 +994,30 @@ "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", - "name": "Mixin.method2" + "name": "Mixin.method2", + "qualifiedName": "Mixin.method2" } } ], "inheritedFrom": { "type": "reference", - "name": "Mixin.method2" + "name": "Mixin.method2", + "qualifiedName": "Mixin.method2" } } ], @@ -991,11 +1057,15 @@ "queryType": { "type": "reference", "id": 33, - "name": "Mixin2" + "name": "Mixin2", + "qualifiedName": "Mixin2", + "package": "typedoc" } } ], - "name": "Mixin" + "name": "Mixin", + "qualifiedName": "Mixin", + "package": "typedoc" } ] }, @@ -1073,7 +1143,9 @@ "type": { "type": "reference", "id": 10, - "name": "A" + "name": "A", + "qualifiedName": "A", + "package": "typedoc" } } ] @@ -1154,7 +1226,9 @@ "type": { "type": "reference", "id": 5, - "name": "A" + "name": "A", + "qualifiedName": "A", + "package": "typedoc" } } ] @@ -1191,7 +1265,9 @@ "type": { "type": "reference", "id": 1, - "name": "AnyFunction" + "name": "AnyFunction", + "qualifiedName": "AnyFunction", + "package": "typedoc" } } ], @@ -1204,7 +1280,9 @@ { "type": "reference", "id": 12, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ], "name": "ReturnType", @@ -1220,12 +1298,14 @@ { "type": "reference", "id": 25, - "name": "Mixin1Type" + "name": "Mixin1Type", + "qualifiedName": "Mixin1Type" }, { "type": "reference", "id": 39, - "name": "Mixin2Type" + "name": "Mixin2Type", + "qualifiedName": "Mixin2Type" } ] }, @@ -1265,11 +1345,15 @@ "queryType": { "type": "reference", "id": 51, - "name": "Mixin3" + "name": "Mixin3", + "qualifiedName": "Mixin3", + "package": "typedoc" } } ], - "name": "Mixin" + "name": "Mixin", + "qualifiedName": "Mixin", + "package": "typedoc" } }, { @@ -1312,10 +1396,14 @@ { "type": "reference", "id": 13, - "name": "Base" + "name": "Base", + "qualifiedName": "Base", + "package": "typedoc" } ], - "name": "AnyConstructor" + "name": "AnyConstructor", + "qualifiedName": "AnyConstructor", + "package": "typedoc" } } ], @@ -1328,7 +1416,9 @@ "type": { "type": "reference", "id": 21, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -1357,7 +1447,9 @@ "name": "any" } ], - "name": "Mixin1Class" + "name": "Mixin1Class", + "qualifiedName": "Mixin1Class", + "package": "typedoc" } } ], @@ -1382,7 +1474,9 @@ { "type": "reference", "id": 21, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ] } @@ -1432,17 +1526,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" } } ], @@ -1455,7 +1555,9 @@ "type": { "type": "reference", "id": 35, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -1484,7 +1586,9 @@ "name": "any" } ], - "name": "Mixin2" + "name": "Mixin2", + "qualifiedName": "Mixin2", + "package": "typedoc" } } ], @@ -1509,7 +1613,9 @@ { "type": "reference", "id": 35, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } ] } @@ -1564,7 +1670,9 @@ "name": "object" } ], - "name": "AnyConstructor" + "name": "AnyConstructor", + "qualifiedName": "AnyConstructor", + "package": "typedoc" } } ], @@ -1577,7 +1685,9 @@ "type": { "type": "reference", "id": 53, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -1606,7 +1716,9 @@ "name": "any" } ], - "name": "Mixin3" + "name": "Mixin3", + "qualifiedName": "Mixin3", + "package": "typedoc" } } ], @@ -1631,7 +1743,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 80b737e28..c4ee2cad9 100644 --- a/src/test/converter/react/specs.json +++ b/src/test/converter/react/specs.json @@ -38,14 +38,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 27430f694..0c4fa6685 100644 --- a/src/test/converter/types/specs.json +++ b/src/test/converter/types/specs.json @@ -82,7 +82,9 @@ "checkType": { "type": "reference", "id": 12, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" }, "extendsType": { "type": "tuple", @@ -109,7 +111,9 @@ }, "trueType": { "type": "reference", - "name": "S" + "name": "S", + "qualifiedName": "S", + "package": "typedoc" }, "falseType": { "type": "intrinsic", @@ -493,7 +497,9 @@ "target": { "type": "reference", "id": 35, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } }, { @@ -506,12 +512,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": { @@ -521,14 +531,18 @@ [ { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "" ], [ { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "" ] @@ -566,19 +580,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" } } } @@ -619,7 +639,9 @@ "type": { "type": "reference", "id": 30, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -634,12 +656,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": { @@ -649,14 +675,18 @@ [ { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "" ], [ { "type": "reference", - "name": "K" + "name": "K", + "qualifiedName": "K", + "package": "typedoc" }, "" ] @@ -702,7 +732,9 @@ "type": { "type": "reference", "id": 26, - "name": "T" + "name": "T", + "qualifiedName": "T", + "package": "typedoc" } } ], @@ -878,7 +910,9 @@ "queryType": { "type": "reference", "id": 41, - "name": "x" + "name": "x", + "qualifiedName": "x", + "package": "typedoc" } } }, @@ -1471,7 +1505,9 @@ "target": { "type": "reference", "id": 57, - "name": "C" + "name": "C", + "qualifiedName": "C", + "package": "typedoc" } } }, @@ -1700,12 +1736,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" } ] } @@ -1741,12 +1781,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" } ] } @@ -1778,12 +1822,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 9d3dd514c..d6758ae4e 100644 --- a/src/test/converter/variables/specs.json +++ b/src/test/converter/variables/specs.json @@ -50,10 +50,14 @@ { "type": "reference", "id": 5, - "name": "T" + "name": "T", + "qualifiedName": "Array.T", + "package": "typedoc" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } } ] @@ -87,7 +91,8 @@ { "type": "reference", "id": 12, - "name": "FooList" + "name": "FooList", + "qualifiedName": "FooList" } ] }, @@ -119,7 +124,9 @@ "type": { "type": "reference", "id": 9, - "name": "Foo" + "name": "Foo", + "qualifiedName": "Foo", + "package": "typedoc" } } ] @@ -170,19 +177,23 @@ "type": { "type": "reference", "id": 12, - "name": "FooList" + "name": "FooList", + "qualifiedName": "FooList", + "package": "typedoc" }, "inheritedFrom": { "type": "reference", "id": 4, - "name": "Array.constructor" + "name": "Array.constructor", + "qualifiedName": "Array.constructor" } } ], "inheritedFrom": { "type": "reference", "id": 3, - "name": "Array.constructor" + "name": "Array.constructor", + "qualifiedName": "Array.constructor" } } ], @@ -210,10 +221,14 @@ { "type": "reference", "id": 9, - "name": "Foo" + "name": "Foo", + "qualifiedName": "Foo", + "package": "typedoc" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } ] }, @@ -263,7 +278,9 @@ "name": "string" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } }, { @@ -318,7 +335,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 7670840f6..76ab42c04 100644 --- a/src/test/converter/variables/specs.nodoc.json +++ b/src/test/converter/variables/specs.nodoc.json @@ -43,7 +43,8 @@ { "type": "reference", "id": 12, - "name": "FooList" + "name": "FooList", + "qualifiedName": "FooList" } ] }, @@ -98,10 +99,14 @@ { "type": "reference", "id": 9, - "name": "Foo" + "name": "Foo", + "qualifiedName": "Foo", + "package": "typedoc" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } ] }, @@ -151,7 +156,9 @@ "name": "string" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" } }, { @@ -206,7 +213,9 @@ "name": "number" } ], - "name": "Array" + "name": "Array", + "qualifiedName": "Array", + "package": "typedoc" }, "defaultValue": "{}" }