From 295ccdd892d344dc373bfe17f3948c5f16587a70 Mon Sep 17 00:00:00 2001 From: Gerrit Birkeland Date: Sun, 15 Mar 2020 16:23:00 -0600 Subject: [PATCH] fix!: Rename external modules to modules Closes #109 BREAKING CHANGE: Any plugins which referenced ReflectionKind.ExternalModule or ReflectionKind.Module need to be updated to reference ReflectionKind.Module and ReflectionKind.Namespace respectively. --- src/lib/converter/factories/declaration.ts | 8 +- src/lib/converter/nodes/block.ts | 2 +- src/lib/converter/nodes/module.ts | 2 +- src/lib/converter/plugins/CommentPlugin.ts | 4 +- .../converter/plugins/DynamicModulePlugin.ts | 2 +- src/lib/converter/plugins/GroupPlugin.ts | 2 +- src/lib/models/reflections/abstract.ts | 6 +- src/lib/output/themes/DefaultTheme.ts | 4 +- src/test/converter/alias/specs.json | 4 +- .../class/specs-with-lump-categories.json | 24 +-- .../class/specs-without-exported.json | 24 +-- src/test/converter/class/specs.json | 24 +-- src/test/converter/comment/specs.json | 6 +- src/test/converter/declaration/specs.d.json | 6 +- src/test/converter/dots.in.path/specs.json | 6 +- src/test/converter/enum/specs.json | 4 +- src/test/converter/enum/specs.nodoc.json | 4 +- .../exports/specs-without-exported.json | 12 +- src/test/converter/exports/specs.json | 12 +- src/test/converter/function/specs.json | 12 +- src/test/converter/interface/specs.json | 12 +- src/test/converter/mixin/specs.json | 4 +- src/test/converter/react/specs.json | 4 +- src/test/converter/types/specs.json | 6 +- src/test/converter/variables/specs.json | 10 +- src/test/converter/variables/specs.nodoc.json | 10 +- .../specs/classes/_access_.privateclass.html | 57 +++---- .../specs/classes/_classes_.baseclass.html | 61 +++----- .../specs/classes/_classes_.genericclass.html | 61 +++----- .../classes/_classes_.internalclass.html | 61 +++----- .../classes/_classes_.nongenericclass.html | 63 +++----- .../specs/classes/_classes_.subclassa.html | 61 +++----- .../specs/classes/_classes_.subclassb.html | 61 +++----- ..._default_export_.defaultexportedclass.html | 49 ++---- ..._default_export_.notexportedclassname.html | 49 ++---- .../classes/_flattened_.flattenedclass.html | 51 ++---- .../renderer/specs/classes/_mixin_.base.html | 65 +++----- .../classes/_mixin_.someclasswithmixin.html | 65 +++----- .../_single_export_.notexportedclass.html | 47 ++---- .../_single_export_.singleexportedclass.html | 47 ++---- .../enums/_enumerations_.directions.html | 49 ++---- .../specs/enums/_enumerations_.size.html | 49 ++---- src/test/renderer/specs/globals.html | 73 ++++----- src/test/renderer/specs/index.html | 45 ++---- .../interfaces/_classes_.nameinterface.html | 61 +++----- .../interfaces/_classes_.printinterface.html | 61 +++----- .../_classes_.printnameinterface.html | 61 +++----- .../specs/interfaces/_generics_.a.html | 61 +++----- .../specs/interfaces/_generics_.ab.html | 63 +++----- .../specs/interfaces/_generics_.abnumber.html | 63 +++----- .../specs/interfaces/_generics_.abstring.html | 63 +++----- .../specs/interfaces/_generics_.b.html | 61 +++----- .../specs/interfaces/_mixin_.mixin1type.html | 67 +++----- .../specs/interfaces/_mixin_.mixin2.html | 67 +++----- src/test/renderer/specs/modules/_access_.html | 85 ++++------ .../specs/modules/_access_.privatemodule.html | 57 +++---- .../renderer/specs/modules/_classes_.html | 83 ++++------ .../specs/modules/_default_export_.html | 61 +++----- .../specs/modules/_enumerations_.html | 55 +++---- .../renderer/specs/modules/_flattened_.html | 75 ++++----- .../renderer/specs/modules/_functions_.html | 147 ++++++++---------- .../modules/_functions_.modulefunction.html | 73 ++++----- .../renderer/specs/modules/_generics_.html | 95 +++++------ src/test/renderer/specs/modules/_mixin_.html | 111 ++++++------- src/test/renderer/specs/modules/_mod2_.html | 61 +++----- src/test/renderer/specs/modules/_mod_.html | 61 +++----- .../renderer/specs/modules/_modules_.html | 77 ++++----- .../specs/modules/_modules_.mymodule.html | 79 ++++------ .../_modules_.mymodule.mysubmodule.html | 63 +++----- .../specs/modules/_single_export_.html | 55 +++---- .../renderer/specs/modules/_weird_names_.html | 53 ++----- 71 files changed, 1163 insertions(+), 1984 deletions(-) diff --git a/src/lib/converter/factories/declaration.ts b/src/lib/converter/factories/declaration.ts index 75b658745..942f82046 100644 --- a/src/lib/converter/factories/declaration.ts +++ b/src/lib/converter/factories/declaration.ts @@ -12,7 +12,7 @@ import { createReferenceType } from './reference'; const nonStaticKinds = [ ReflectionKind.Class, ReflectionKind.Interface, - ReflectionKind.Module + ReflectionKind.Namespace ]; /** @@ -73,13 +73,13 @@ export function createDeclaration(context: Context, node: ts.Declaration, kind: let hasComment: boolean = Boolean(getRawComment(node)); // Test whether the node is exported let isExported: boolean; - if (kind === ReflectionKind.ExternalModule || kind === ReflectionKind.Global) { + if (kind === ReflectionKind.Module || kind === ReflectionKind.Global) { isExported = true; hasComment = true; } else if (container.kind === ReflectionKind.Global) { // In file mode, everything is exported. isExported = true; - } else if (container.kindOf([ReflectionKind.Module, ReflectionKind.ExternalModule])) { + } else if (container.kindOf([ReflectionKind.Namespace, ReflectionKind.Module])) { const symbol = context.getSymbolAtLocation(node); if (!symbol) { isExported = false; @@ -220,7 +220,7 @@ function canMergeReflectionsByKind(kind1: ReflectionKind, kind2: ReflectionKind) */ function mergeDeclarations(context: Context, reflection: DeclarationReflection, node: ts.Node, kind: ReflectionKind) { if (reflection.kind !== kind) { - const weights = [ReflectionKind.Module, ReflectionKind.Enum, ReflectionKind.Class]; + const weights = [ReflectionKind.Namespace, ReflectionKind.Enum, ReflectionKind.Class]; const kindWeight = weights.indexOf(kind); const childKindWeight = weights.indexOf(reflection.kind); if (kindWeight > childKindWeight) { diff --git a/src/lib/converter/nodes/block.ts b/src/lib/converter/nodes/block.ts index bd3581b75..d0b046a9a 100644 --- a/src/lib/converter/nodes/block.ts +++ b/src/lib/converter/nodes/block.ts @@ -55,7 +55,7 @@ export class BlockConverter extends ConverterNodeComponent { if (this.mode === SourceFileMode.Modules) { - result = createDeclaration(context, node, ReflectionKind.ExternalModule, node.fileName); + result = createDeclaration(context, node, ReflectionKind.Module, node.fileName); context.withScope(result, () => { this.convertStatements(context, node); result!.setFlag(ReflectionFlag.Exported); diff --git a/src/lib/converter/nodes/module.ts b/src/lib/converter/nodes/module.ts index d96141bf9..7c015fda3 100644 --- a/src/lib/converter/nodes/module.ts +++ b/src/lib/converter/nodes/module.ts @@ -24,7 +24,7 @@ export class ModuleConverter extends ConverterNodeComponent context.scope - : createDeclaration(context, node, ReflectionKind.Module); + : createDeclaration(context, node, ReflectionKind.Namespace); context.withScope(reflection, () => { if (node.body) { this.owner.convertNode(context, node.body); diff --git a/src/lib/converter/plugins/CommentPlugin.ts b/src/lib/converter/plugins/CommentPlugin.ts index c3d8830c6..7f38f38ff 100644 --- a/src/lib/converter/plugins/CommentPlugin.ts +++ b/src/lib/converter/plugins/CommentPlugin.ts @@ -137,7 +137,7 @@ export class CommentPlugin extends ConverterComponent { comment.removeTags('event'); } - if (reflection.kindOf(ReflectionKind.ExternalModule)) { + if (reflection.kindOf(ReflectionKind.Module)) { comment.removeTags('packagedocumentation'); } } @@ -199,7 +199,7 @@ export class CommentPlugin extends ConverterComponent { const comment = parseComment(rawComment, reflection.comment); this.applyModifiers(reflection, comment); this.removeExcludedTags(comment); - } else if (reflection.kindOf(ReflectionKind.Module)) { + } else if (reflection.kindOf(ReflectionKind.Namespace)) { this.storeModuleComment(rawComment, reflection); } else { const comment = parseComment(rawComment, reflection.comment); diff --git a/src/lib/converter/plugins/DynamicModulePlugin.ts b/src/lib/converter/plugins/DynamicModulePlugin.ts index d89080aaa..07a3ca8b6 100644 --- a/src/lib/converter/plugins/DynamicModulePlugin.ts +++ b/src/lib/converter/plugins/DynamicModulePlugin.ts @@ -52,7 +52,7 @@ export class DynamicModulePlugin extends ConverterComponent { * @param node The node that is currently processed if available. */ private onDeclaration(context: Context, reflection: Reflection, node?: ts.Node) { - if (reflection.kindOf(ReflectionKind.ExternalModule)) { + if (reflection.kindOf(ReflectionKind.Module)) { let name = reflection.name; if (!name.includes('/')) { return; diff --git a/src/lib/converter/plugins/GroupPlugin.ts b/src/lib/converter/plugins/GroupPlugin.ts index 80e634d36..97e21e2e3 100644 --- a/src/lib/converter/plugins/GroupPlugin.ts +++ b/src/lib/converter/plugins/GroupPlugin.ts @@ -17,8 +17,8 @@ export class GroupPlugin extends ConverterComponent { */ static WEIGHTS = [ ReflectionKind.Global, - ReflectionKind.ExternalModule, ReflectionKind.Module, + ReflectionKind.Namespace, ReflectionKind.Enum, ReflectionKind.EnumMember, ReflectionKind.Class, diff --git a/src/lib/models/reflections/abstract.ts b/src/lib/models/reflections/abstract.ts index 162097aa9..0aff71480 100644 --- a/src/lib/models/reflections/abstract.ts +++ b/src/lib/models/reflections/abstract.ts @@ -36,8 +36,8 @@ export function resetReflectionID() { */ export enum ReflectionKind { Global = 0, - ExternalModule = 1 << 0, - Module = 1 << 1, + Module = 1 << 0, + Namespace = 1 << 1, Enum = 1 << 2, EnumMember = 1 << 4, Variable = 1 << 5, @@ -66,7 +66,7 @@ export enum ReflectionKind { FunctionOrMethod = ReflectionKind.Function | Method, ClassMember = Accessor | Constructor | Method | Property | Event, SomeSignature = CallSignature | IndexSignature | ConstructorSignature | GetSignature | SetSignature, - SomeModule = Module | ExternalModule, + SomeModule = Namespace | Module, SomeType = Interface | TypeLiteral | TypeParameter | TypeAlias, SomeValue = Variable | Function | ObjectLiteral } diff --git a/src/lib/output/themes/DefaultTheme.ts b/src/lib/output/themes/DefaultTheme.ts index e79ff3cf5..e9703ce2e 100644 --- a/src/lib/output/themes/DefaultTheme.ts +++ b/src/lib/output/themes/DefaultTheme.ts @@ -61,7 +61,7 @@ export class DefaultTheme extends Theme { directory: 'enums', template: 'reflection.hbs' }, { - kind: [ReflectionKind.Module, ReflectionKind.ExternalModule], + kind: [ReflectionKind.Namespace, ReflectionKind.Module], isLeaf: false, directory: 'modules', template: 'reflection.hbs' @@ -375,7 +375,7 @@ export class NavigationBuilder { let target = someModule.parent; let inScope = (someModule === this.entryPoint); while (target) { - if (target.kindOf(ReflectionKind.ExternalModule)) { + if (target.kindOf(ReflectionKind.Module)) { return; } if (this.entryPoint === target) { diff --git a/src/test/converter/alias/specs.json b/src/test/converter/alias/specs.json index cb302bdae..9b2ae3bf7 100644 --- a/src/test/converter/alias/specs.json +++ b/src/test/converter/alias/specs.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"alias\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -629,7 +629,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1 diff --git a/src/test/converter/class/specs-with-lump-categories.json b/src/test/converter/class/specs-with-lump-categories.json index 2fcc3876c..4973fa99c 100644 --- a/src/test/converter/class/specs-with-lump-categories.json +++ b/src/test/converter/class/specs-with-lump-categories.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"access\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -336,7 +336,7 @@ "id": 15, "name": "\"class\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1794,7 +1794,7 @@ "id": 77, "name": "\"clodule-with-subclass\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1940,7 +1940,7 @@ "id": 82, "name": "\"constructor-properties\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -2411,7 +2411,7 @@ "id": 103, "name": "\"decorators\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -2778,7 +2778,7 @@ "id": 147, "name": "\"events\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -2855,7 +2855,7 @@ "id": 120, "name": "\"events-overloads\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -3280,7 +3280,7 @@ "id": 150, "name": "\"generic-class\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -3717,7 +3717,7 @@ "id": 168, "name": "\"getter-setter\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -3924,7 +3924,7 @@ "id": 180, "name": "\"this\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -4018,7 +4018,7 @@ "id": 184, "name": "\"type-operator\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -4200,7 +4200,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1, diff --git a/src/test/converter/class/specs-without-exported.json b/src/test/converter/class/specs-without-exported.json index 400c98122..aaa76b793 100644 --- a/src/test/converter/class/specs-without-exported.json +++ b/src/test/converter/class/specs-without-exported.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"access\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -336,7 +336,7 @@ "id": 15, "name": "\"class\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1677,7 +1677,7 @@ "id": 71, "name": "\"clodule-with-subclass\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1823,7 +1823,7 @@ "id": 76, "name": "\"constructor-properties\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1840,7 +1840,7 @@ "id": 77, "name": "\"decorators\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1857,7 +1857,7 @@ "id": 79, "name": "\"events\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1874,7 +1874,7 @@ "id": 78, "name": "\"events-overloads\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1891,7 +1891,7 @@ "id": 80, "name": "\"generic-class\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1908,7 +1908,7 @@ "id": 81, "name": "\"getter-setter\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1925,7 +1925,7 @@ "id": 82, "name": "\"this\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -2019,7 +2019,7 @@ "id": 86, "name": "\"type-operator\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -2201,7 +2201,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1, diff --git a/src/test/converter/class/specs.json b/src/test/converter/class/specs.json index b4ff7ab7a..43cbbaf5c 100644 --- a/src/test/converter/class/specs.json +++ b/src/test/converter/class/specs.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"access\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -336,7 +336,7 @@ "id": 15, "name": "\"class\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1790,7 +1790,7 @@ "id": 77, "name": "\"clodule-with-subclass\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1936,7 +1936,7 @@ "id": 82, "name": "\"constructor-properties\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -2407,7 +2407,7 @@ "id": 103, "name": "\"decorators\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -2774,7 +2774,7 @@ "id": 147, "name": "\"events\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -2851,7 +2851,7 @@ "id": 120, "name": "\"events-overloads\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -3276,7 +3276,7 @@ "id": 150, "name": "\"generic-class\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -3713,7 +3713,7 @@ "id": 168, "name": "\"getter-setter\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -3920,7 +3920,7 @@ "id": 180, "name": "\"this\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -4014,7 +4014,7 @@ "id": 184, "name": "\"type-operator\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -4196,7 +4196,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1, diff --git a/src/test/converter/comment/specs.json b/src/test/converter/comment/specs.json index b7fc2e73a..00e05125c 100644 --- a/src/test/converter/comment/specs.json +++ b/src/test/converter/comment/specs.json @@ -8,7 +8,7 @@ "id": 6, "name": "\"comment\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -232,7 +232,7 @@ "id": 1, "name": "\"comment2\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -321,7 +321,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 6, diff --git a/src/test/converter/declaration/specs.d.json b/src/test/converter/declaration/specs.d.json index e42288d8c..43dc46084 100644 --- a/src/test/converter/declaration/specs.d.json +++ b/src/test/converter/declaration/specs.d.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"declaration.d\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -111,7 +111,7 @@ "id": 5, "name": "\"export-declaration.d\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -171,7 +171,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1, diff --git a/src/test/converter/dots.in.path/specs.json b/src/test/converter/dots.in.path/specs.json index 0673b9962..931a5bb1a 100644 --- a/src/test/converter/dots.in.path/specs.json +++ b/src/test/converter/dots.in.path/specs.json @@ -8,7 +8,7 @@ "id": 3, "name": "\"function\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -86,7 +86,7 @@ "id": 1, "name": "\"interface-empty\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -132,7 +132,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 3, diff --git a/src/test/converter/enum/specs.json b/src/test/converter/enum/specs.json index 558676852..d54a65615 100644 --- a/src/test/converter/enum/specs.json +++ b/src/test/converter/enum/specs.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"enum\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -363,7 +363,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1 diff --git a/src/test/converter/enum/specs.nodoc.json b/src/test/converter/enum/specs.nodoc.json index 558676852..d54a65615 100644 --- a/src/test/converter/enum/specs.nodoc.json +++ b/src/test/converter/enum/specs.nodoc.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"enum\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -363,7 +363,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1 diff --git a/src/test/converter/exports/specs-without-exported.json b/src/test/converter/exports/specs-without-exported.json index 59c9b76f7..8a30bf41c 100644 --- a/src/test/converter/exports/specs-without-exported.json +++ b/src/test/converter/exports/specs-without-exported.json @@ -8,7 +8,7 @@ "id": 15, "name": "\"export\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -156,7 +156,7 @@ "id": 1, "name": "\"export-assignment\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -173,7 +173,7 @@ "id": 2, "name": "\"export-default\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -190,7 +190,7 @@ "id": 3, "name": "\"export-with-local\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -306,7 +306,7 @@ "id": 9, "name": "\"mod\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -397,7 +397,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 15, diff --git a/src/test/converter/exports/specs.json b/src/test/converter/exports/specs.json index 6620e4fba..5a65b4a5e 100644 --- a/src/test/converter/exports/specs.json +++ b/src/test/converter/exports/specs.json @@ -8,7 +8,7 @@ "id": 27, "name": "\"export\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -197,7 +197,7 @@ "id": 1, "name": "\"export-assignment\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -279,7 +279,7 @@ "id": 6, "name": "\"export-default\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -329,7 +329,7 @@ "id": 8, "name": "\"export-with-local\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -519,7 +519,7 @@ "id": 19, "name": "\"mod\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -647,7 +647,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 27, diff --git a/src/test/converter/function/specs.json b/src/test/converter/function/specs.json index 352b4ac82..ddb1a8a0a 100644 --- a/src/test/converter/function/specs.json +++ b/src/test/converter/function/specs.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"function\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -18,7 +18,7 @@ "id": 35, "name": "moduleFunction", "kind": 2, - "kindString": "Module", + "kindString": "Namespace", "flags": { "isExported": true }, @@ -1052,7 +1052,7 @@ ], "groups": [ { - "title": "Modules", + "title": "Namespaces", "kind": 2, "children": [ 35 @@ -1089,7 +1089,7 @@ "id": 57, "name": "\"generic-function\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1265,7 +1265,7 @@ "id": 67, "name": "\"implicit-types\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1676,7 +1676,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1, diff --git a/src/test/converter/interface/specs.json b/src/test/converter/interface/specs.json index 61fb7191f..a2b5d9147 100644 --- a/src/test/converter/interface/specs.json +++ b/src/test/converter/interface/specs.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"constructor-type\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -210,7 +210,7 @@ "id": 14, "name": "\"interface-empty\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -360,7 +360,7 @@ "id": 20, "name": "\"interface-implementation\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -370,7 +370,7 @@ "id": 21, "name": "Forms", "kind": 2, - "kindString": "Module", + "kindString": "Namespace", "flags": {}, "children": [ { @@ -1607,7 +1607,7 @@ ], "groups": [ { - "title": "Modules", + "title": "Namespaces", "kind": 2, "children": [ 21 @@ -1625,7 +1625,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1, diff --git a/src/test/converter/mixin/specs.json b/src/test/converter/mixin/specs.json index 421e060f8..406504a54 100644 --- a/src/test/converter/mixin/specs.json +++ b/src/test/converter/mixin/specs.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"mixin\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -1687,7 +1687,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1 diff --git a/src/test/converter/react/specs.json b/src/test/converter/react/specs.json index d20d42793..a5ba4a925 100644 --- a/src/test/converter/react/specs.json +++ b/src/test/converter/react/specs.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"react\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -279,7 +279,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1 diff --git a/src/test/converter/types/specs.json b/src/test/converter/types/specs.json index c21f00d8e..ab4e5d3f4 100644 --- a/src/test/converter/types/specs.json +++ b/src/test/converter/types/specs.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"query\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -89,7 +89,7 @@ "id": 4, "name": "\"union-or-intersection\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -373,7 +373,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1, diff --git a/src/test/converter/variables/specs.json b/src/test/converter/variables/specs.json index 2a03592cc..238676526 100644 --- a/src/test/converter/variables/specs.json +++ b/src/test/converter/variables/specs.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"array\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -4570,7 +4570,7 @@ "id": 234, "name": "\"destructuring\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -4977,7 +4977,7 @@ "id": 253, "name": "\"literal\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -6034,7 +6034,7 @@ "id": 310, "name": "\"variable\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -6203,7 +6203,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1, diff --git a/src/test/converter/variables/specs.nodoc.json b/src/test/converter/variables/specs.nodoc.json index c15805b83..4062aa13d 100644 --- a/src/test/converter/variables/specs.nodoc.json +++ b/src/test/converter/variables/specs.nodoc.json @@ -8,7 +8,7 @@ "id": 1, "name": "\"array\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -3957,7 +3957,7 @@ "id": 200, "name": "\"destructuring\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -4042,7 +4042,7 @@ "id": 205, "name": "\"literal\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -4137,7 +4137,7 @@ "id": 209, "name": "\"variable\"", "kind": 1, - "kindString": "External module", + "kindString": "Module", "flags": { "isExported": true }, @@ -4153,7 +4153,7 @@ ], "groups": [ { - "title": "External modules", + "title": "Modules", "kind": 1, "children": [ 1, diff --git a/src/test/renderer/specs/classes/_access_.privateclass.html b/src/test/renderer/specs/classes/_access_.privateclass.html index 8b1d3878d..27f13c484 100644 --- a/src/test/renderer/specs/classes/_access_.privateclass.html +++ b/src/test/renderer/specs/classes/_access_.privateclass.html @@ -192,48 +192,48 @@

Returns void Globals -
  • +
  • "access"
    • -
  • +
  • "classes"
    • -
  • +
  • "default-export"
    • -
  • +
  • "enumerations"
    • -
  • +
  • "flattened"
    • -
  • +
  • "functions"
    • -
  • +
  • "generics"
    • -
  • +
  • "mixin"
    • -
  • +
  • "mod"
    • -
  • +
  • "mod2"
    • -
  • +
  • "modules"
    • -
  • +
  • "single-export"
    • -
  • +
  • "weird-names"
    • @@ -242,7 +242,7 @@

    Returns void @@ -537,7 +537,7 @@

    Returns string