Skip to content

Commit 8ff6b4c

Browse files
committed
Merge branch pr1816 into beta
... uhhh, and some cleanup since I didn't realize I failed to commit
2 parents 9f846e1 + 905150a commit 8ff6b4c

File tree

22 files changed

+132
-595
lines changed

22 files changed

+132
-595
lines changed

.config/typedoc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"entryPoints": ["../src"],
1313
"entryPointStrategy": "Resolve",
1414
"excludeExternals": true,
15-
"excludePrivate": true,
15+
"excludePrivate": false,
1616
"excludeInternal": true,
1717
"treatWarningsAsErrors": false,
1818
"validation": {

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ These TODOs will be resolved before a full release. ([GitHub project](https://gi
4545
- Added support for inline `@inheritDoc` tags, #1480.
4646
- It is now possible to link directly to a specific overload, #1326.
4747
- The JSON output will now include URLs to the file on the remote repository if possible.
48+
- Added a new `visibilityFilters` option which controls the available filters on a page.
4849

4950
### Bug Fixes
5051

@@ -59,6 +60,7 @@ These TODOs will be resolved before a full release. ([GitHub project](https://gi
5960

6061
### Thanks!
6162

63+
- @aqumus
6264
- @fb55
6365
- @futurGH
6466
- @Shane4368

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"rebuild_specs": "node scripts/rebuild_specs.js",
7171
"build": "npm run build:tsc && npm run build:themes",
7272
"build:tsc": "tsc --project .",
73-
"build:themes": "esbuild src/lib/output/themes/default/assets/bootstrap.ts --bundle --minify --outfile=static/main.js",
73+
"build:themes": "node scripts/build_themes.js",
7474
"build:prod": "npm run build:prod:tsc && npm run build:themes",
7575
"build:prod:tsc": "tsc --project . --sourceMap false",
7676
"lint": "eslint . && npm run prettier -- --check .",

scripts/build_themes.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
const esbuild = require("esbuild");
2+
3+
esbuild.buildSync({
4+
entryPoints: ["src/lib/output/themes/default/assets/bootstrap.ts"],
5+
bundle: true,
6+
minify: true,
7+
outfile: "static/main.js",
8+
banner: {
9+
js: '"use strict";',
10+
},
11+
logLevel: "info",
12+
});

src/lib/converter/plugins/GroupPlugin.ts

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ export class GroupPlugin extends ConverterComponent {
139139
reflections: DeclarationReflection[]
140140
): ReflectionGroup[] {
141141
const groups = new Map<string, ReflectionGroup>();
142+
142143
reflections.forEach((child) => {
143144
for (const name of GroupPlugin.getGroups(child)) {
144145
let group = groups.get(name);
@@ -151,31 +152,6 @@ export class GroupPlugin extends ConverterComponent {
151152
}
152153
});
153154

154-
groups.forEach((group) => {
155-
let allInherited = true;
156-
let allPrivate = true;
157-
let allProtected = true;
158-
let allExternal = true;
159-
160-
group.children.forEach((child) => {
161-
allPrivate &&= child.flags.isPrivate;
162-
allProtected &&=
163-
child.flags.isPrivate || child.flags.isProtected;
164-
allExternal &&= child.flags.isExternal;
165-
166-
if (child instanceof DeclarationReflection) {
167-
allInherited &&= !!child.inheritedFrom;
168-
} else {
169-
allInherited = false;
170-
}
171-
});
172-
173-
group.allChildrenAreInherited = allInherited;
174-
group.allChildrenArePrivate = allPrivate;
175-
group.allChildrenAreProtectedOrPrivate = allProtected;
176-
group.allChildrenAreExternal = allExternal;
177-
});
178-
179155
return Array.from(groups.values());
180156
}
181157

src/lib/models/ReflectionGroup.ts

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,6 @@ export class ReflectionGroup {
2020
*/
2121
children: DeclarationReflection[] = [];
2222

23-
/**
24-
* A list of generated css classes that should be applied to representations of this
25-
* group in the generated markup.
26-
*/
27-
cssClasses?: string;
28-
29-
/**
30-
* Are all children inherited members?
31-
*/
32-
allChildrenAreInherited?: boolean;
33-
34-
/**
35-
* Are all children private members?
36-
*/
37-
allChildrenArePrivate?: boolean;
38-
39-
/**
40-
* Are all children private or protected members?
41-
*/
42-
allChildrenAreProtectedOrPrivate?: boolean;
43-
44-
/**
45-
* Are all children external members?
46-
*/
47-
allChildrenAreExternal?: boolean;
48-
4923
/**
5024
* Categories contained within this group.
5125
*/

src/lib/output/events.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import * as Path from "path";
33
import { Event } from "../utils/events";
44
import type { ProjectReflection } from "../models/reflections/project";
55
import type { RenderTemplate, UrlMapping } from "./models/UrlMapping";
6-
import type { LegendItem } from "./plugins/LegendPlugin";
76

87
/**
98
* An event emitted by the {@link Renderer} class at the very beginning and
@@ -105,12 +104,6 @@ export class PageEvent<Model = unknown> extends Event {
105104
*/
106105
template!: RenderTemplate<this>;
107106

108-
/**
109-
* The legend items that are applicable for this page
110-
* @internal this is going away. The footer will do the logic itself.
111-
*/
112-
legend?: LegendItem[][];
113-
114107
/**
115108
* The final html content of this page.
116109
*

0 commit comments

Comments
 (0)