From e5ed318c391ae2324339baa057c012367e1d395e Mon Sep 17 00:00:00 2001 From: Gerrit Birkeland Date: Sun, 28 Oct 2018 08:31:57 -0600 Subject: [PATCH] Resolve build errors Strict null checks required a few changes to code changed by this PR. --- src/lib/converter/context.ts | 2 +- src/lib/converter/converter.ts | 2 +- src/lib/utils/options/readers/tsconfig.ts | 4 ++-- src/lib/utils/options/readers/typedoc.ts | 4 ++-- src/test/renderer/specs/index.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts index 40cd5a144..b2da96fb1 100644 --- a/src/lib/converter/context.ts +++ b/src/lib/converter/context.ts @@ -95,7 +95,7 @@ export class Context { /** * The pattern that should be used to flag external source files. */ - private externalPattern: Array; + private externalPattern?: Array; /** * Create a new Context instance. diff --git a/src/lib/converter/converter.ts b/src/lib/converter/converter.ts index e9c4b85a1..c22680ce6 100644 --- a/src/lib/converter/converter.ts +++ b/src/lib/converter/converter.ts @@ -45,7 +45,7 @@ export class Converter extends ChildableComponent; + externalPattern!: Array; @Option({ name: 'includeDeclarations', diff --git a/src/lib/utils/options/readers/tsconfig.ts b/src/lib/utils/options/readers/tsconfig.ts index 0b1d3f878..30bac190a 100644 --- a/src/lib/utils/options/readers/tsconfig.ts +++ b/src/lib/utils/options/readers/tsconfig.ts @@ -40,7 +40,7 @@ export class TSConfigReader extends OptionsComponent { return; } - let file: string; + let file: string | undefined; if (TSConfigReader.OPTIONS_KEY in event.data) { const tsconfig = event.data[TSConfigReader.OPTIONS_KEY]; @@ -52,7 +52,7 @@ export class TSConfigReader extends OptionsComponent { } if (!file || !FS.existsSync(file)) { - event.addError('The tsconfig file %s does not exist.', file); + event.addError('The tsconfig file %s does not exist.', file || ''); return; } } else if (TSConfigReader.PROJECT_KEY in event.data) { diff --git a/src/lib/utils/options/readers/typedoc.ts b/src/lib/utils/options/readers/typedoc.ts index 7b5ef41a1..2ff821f1d 100644 --- a/src/lib/utils/options/readers/typedoc.ts +++ b/src/lib/utils/options/readers/typedoc.ts @@ -31,7 +31,7 @@ export class TypedocReader extends OptionsComponent { return; } - let file: string; + let file: string | undefined; if (TypedocReader.OPTIONS_KEY in event.data) { let opts = event.data[TypedocReader.OPTIONS_KEY]; @@ -42,7 +42,7 @@ export class TypedocReader extends OptionsComponent { file = this.findTypedocFile(opts); - if (!FS.existsSync(file)) { + if (!file || !FS.existsSync(file)) { event.addError('The options file could not be found with the given path %s.', opts); return; } diff --git a/src/test/renderer/specs/index.html b/src/test/renderer/specs/index.html index 988295860..4e7522cef 100644 --- a/src/test/renderer/specs/index.html +++ b/src/test/renderer/specs/index.html @@ -203,4 +203,4 @@

Legend

- + \ No newline at end of file