cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(bazel): make resolveTypeReferenceDirectives override work with both ts 2.9 & ts 3.0 (#25774)

Browse Source 
PR Close #25774
This commit is contained in:
Greg Magolan
2018-08-28 13:36:16 -07:00
committed by Igor Minar
parent b404d47b16
commit f85d3d7857
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/compiler-cli/src/ngtsc/compiler_host.ts
View File

@ -36,14 +36,19 @@ export interface CompilerHost extends ts.CompilerHost {
export class NgtscCompilerHost implements CompilerHost { export class NgtscCompilerHost implements CompilerHost {
constructor(private delegate: ts.CompilerHost) { constructor(private delegate: ts.CompilerHost) {
if (delegate.resolveTypeReferenceDirectives) { if (delegate.resolveTypeReferenceDirectives) {
// Backward compatibility with TypeScript 2.9 and older since return
// type has changed from (ts.ResolvedTypeReferenceDirective | undefined)[]
// to ts.ResolvedTypeReferenceDirective[] in Typescript 3.0
type ts3ResolveTypeReferenceDirectives = (names: string[], containingFile: string) =>
ts.ResolvedTypeReferenceDirective[];
this.resolveTypeReferenceDirectives = (names: string[], containingFile: string) => this.resolveTypeReferenceDirectives = (names: string[], containingFile: string) =>
delegate.resolveTypeReferenceDirectives !(names, containingFile); (delegate.resolveTypeReferenceDirectives as ts3ResolveTypeReferenceDirectives) !(
names, containingFile);
} }
} }
resolveTypeReferenceDirectives?: resolveTypeReferenceDirectives?:
(names: string[], (names: string[], containingFile: string) => ts.ResolvedTypeReferenceDirective[];
containingFile: string) => (ts.ResolvedTypeReferenceDirective | undefined)[];
getSourceFile( getSourceFile(
fileName: string, languageVersion: ts.ScriptTarget, fileName: string, languageVersion: ts.ScriptTarget,

11
packages/compiler-cli/src/transformers/compiler_host.ts
View File

@ -83,8 +83,7 @@ export class TsCompilerAotCompilerTypeCheckHostAdapter implements ts.CompilerHos
// TODO(issue/24571): remove '!'. // TODO(issue/24571): remove '!'.
getDirectories !: (path: string) => string[]; getDirectories !: (path: string) => string[];
resolveTypeReferenceDirectives?: resolveTypeReferenceDirectives?:
(names: string[], (names: string[], containingFile: string) => ts.ResolvedTypeReferenceDirective[];
containingFile: string) => (ts.ResolvedTypeReferenceDirective | undefined)[];
directoryExists?: (directoryName: string) => boolean; directoryExists?: (directoryName: string) => boolean;
constructor( constructor(
@ -110,8 +109,14 @@ export class TsCompilerAotCompilerTypeCheckHostAdapter implements ts.CompilerHos
this.getDefaultLibLocation = () => context.getDefaultLibLocation !(); this.getDefaultLibLocation = () => context.getDefaultLibLocation !();
} }
if (context.resolveTypeReferenceDirectives) { if (context.resolveTypeReferenceDirectives) {
// Backward compatibility with TypeScript 2.9 and older since return
// type has changed from (ts.ResolvedTypeReferenceDirective | undefined)[]
// to ts.ResolvedTypeReferenceDirective[] in Typescript 3.0
type ts3ResolveTypeReferenceDirectives = (names: string[], containingFile: string) =>
ts.ResolvedTypeReferenceDirective[];
this.resolveTypeReferenceDirectives = (names: string[], containingFile: string) => this.resolveTypeReferenceDirectives = (names: string[], containingFile: string) =>
context.resolveTypeReferenceDirectives !(names, containingFile); (context.resolveTypeReferenceDirectives as ts3ResolveTypeReferenceDirectives) !(
names, containingFile);
} }
if (context.trace) { if (context.trace) {
this.trace = s => context.trace !(s); this.trace = s => context.trace !(s);