Skip to content

Commit

Permalink
feat: Expose @Option for plugin use
Browse files Browse the repository at this point in the history
Also exposes the necessary types + values to declare and set options.

Closes #1163
Closes #1165
  • Loading branch information
Gerrit0 committed Jan 13, 2020
1 parent 1fd2185 commit 6a762f0
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 6 deletions.
22 changes: 21 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,36 @@ export { NavigationItem } from './lib/output/models/NavigationItem';
export { UrlMapping } from './lib/output/models/UrlMapping';

export {
SourceFileMode
} from './lib/converter';

export {
Option,
Options,
OptionsReader,
ParameterHint,
ParameterScope,
ParameterType,

TypeDocOptions,
TypeDocAndTSOptions,
TypeDocOptionMap,
KeyToDeclaration,

TSConfigReader,
TypeDocReader,
ArgumentsReader
ArgumentsReader,

DeclarationOption,

DeclarationOptionBase,
StringDeclarationOption,
NumberDeclarationOption,
BooleanDeclarationOption,
ArrayDeclarationOption,
MixedDeclarationOption,
MapDeclarationOption,
DeclarationOptionToOptionType
} from './lib/utils/options';

export { JSONOutput } from './lib/serialization';
3 changes: 3 additions & 0 deletions src/lib/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
import { Option, Options, ParameterType } from './utils';
import { ParameterHint } from './utils/options';
import { TypeDocAndTSOptions } from './utils/options/declaration';
import { addDecoratedOptions } from './utils/options/sources';

/**
* The default TypeDoc main application class.
Expand Down Expand Up @@ -158,6 +159,8 @@ export class Application extends ChildableComponent<
}

this.plugins.load();
// Load decorated options from the plugins.
addDecoratedOptions(this.options);

this.options.reset();
this.options.setValues(options).mapErr(errors => {
Expand Down
2 changes: 2 additions & 0 deletions src/lib/converter/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ export { Converter } from './converter';

export { convertDefaultValue, convertExpression } from './convert-expression';

export { SourceFileMode } from './nodes';

import './nodes/index';
import './types/index';
import './plugins/index';
2 changes: 1 addition & 1 deletion src/lib/converter/nodes/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export { AccessorConverter } from './accessor';
export { AliasConverter } from './alias';
export { BlockConverter } from './block';
export { BlockConverter, SourceFileMode } from './block';
export { ClassConverter } from './class';
export { ConstructorConverter } from './constructor';
export { EnumConverter } from './enum';
Expand Down
3 changes: 2 additions & 1 deletion src/lib/utils/options/declaration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ export type TypeDocAndTSOptions = TypeDocOptions
& Pick<CompilerOptions, Exclude<KnownKeys<CompilerOptions>, IgnoredTsOptionKeys>>;

/**
* Describes all TypeDoc options.
* Describes all TypeDoc options. Used internally to provide better types when fetching options.
* External consumers should likely use either [[TypeDocAndTSOptions]] or [[TypeDocOptions]].
*/
export interface TypeDocOptionMap {
options: string;
Expand Down
23 changes: 22 additions & 1 deletion src/lib/utils/options/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
export { Options, OptionsReader } from './options';
export { Option } from './sources';
export { ArgumentsReader, TypeDocReader, TSConfigReader } from './readers';
export { TypeDocOptions, ParameterType, ParameterHint, ParameterScope } from './declaration';
export {
TypeDocOptions,
TypeDocAndTSOptions,

TypeDocOptionMap,
KeyToDeclaration,

ParameterType,
ParameterHint,
ParameterScope,

DeclarationOption,

DeclarationOptionBase,
StringDeclarationOption,
NumberDeclarationOption,
BooleanDeclarationOption,
ArrayDeclarationOption,
MixedDeclarationOption,
MapDeclarationOption,
DeclarationOptionToOptionType
} from './declaration';
4 changes: 3 additions & 1 deletion src/lib/utils/options/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ export class Options {
}

for (const name of names) {
if (this.getDeclaration(name)) {
// Check for registering the same declaration twice, should not be an error.
const decl = this.getDeclaration(name);
if (decl && decl !== declaration) {
this._logger.error(`The option ${name} has already been registered`);
} else {
this._declarations.set(name.toLowerCase(), declaration);
Expand Down
13 changes: 12 additions & 1 deletion src/lib/utils/options/sources/decorator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,18 @@ export function addDecoratedOptions(options: Options) {
* Declares the given option and binds it to the decorated property.
* @param option
*/
export function Option<K extends keyof TypeDocOptionMap>(option: { name: K } & KeyToDeclaration<K>) {
export function Option<K extends keyof TypeDocOptionMap>(option: { name: K } & KeyToDeclaration<K>);

/**
* Declares the given option and binds it to the decorated property without strict checks.
*
* @privateRemarks
* Intended for plugin use only. SHOULD NOT BE USED INTERNALLY.
* @param option
*/
export function Option<K extends keyof TypeDocOptionMap>(option: DeclarationOption);

export function Option(option: DeclarationOption) {
declared.push(option);

return function(target: { application: Application } | { options: Options }, key: PropertyKey) {
Expand Down
9 changes: 9 additions & 0 deletions src/test/utils/options/options.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ describe('Options', () => {
equal(logger.hasErrors(), true);
});

it('Does not error if the same declaration is registered twice', () => {
logger.resetErrors();
const declaration = { name: 'test-declaration', help: '' };
options.addDeclaration(declaration);
options.addDeclaration(declaration);
equal(logger.hasErrors(), false);
options.removeDeclarationByName(declaration.name);
});

it('Supports removing a declaration by name', () => {
options.addDeclaration({ name: 'not-an-option', help: '' });
options.removeDeclarationByName('not-an-option');
Expand Down

0 comments on commit 6a762f0

Please sign in to comment.