fixup! feat: typescript 3.6 support

IgorMinar · IgorMinar · commit 7f684554ece2 · 2019-10-18T07:04:50.000-07:00
diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts
@@ -147,7 +147,8 @@ export class NgtscProgram implements api.Program {
     }
 
     if (generators.length > 0) {
-      this.host = new GeneratedShimsHostWrapper(host, generators);
+      // FIXME: Remove the any cast once google3 is fully on TS3.6.
+      this.host = (new GeneratedShimsHostWrapper(host, generators) as any);
     }
 
     this.tsProgram =
diff --git a/packages/compiler-cli/src/ngtsc/shims/src/host.ts b/packages/compiler-cli/src/ngtsc/shims/src/host.ts
@@ -35,8 +35,10 @@ export class GeneratedShimsHostWrapper implements ts.CompilerHost {
       this.resolveModuleNames =
           (moduleNames: string[], containingFile: string, reusedNames: string[],
            redirectedReference: ts.ResolvedProjectReference, options: ts.CompilerOptions) =>
-              delegate.resolveModuleNames !(
-                  moduleNames, containingFile, reusedNames, redirectedReference, options);
+              // FIXME: Additional parameters are required in TS3.6, but ignored in 3.5.
+          // Remove the any cast once google3 is fully on TS3.6.
+          (delegate.resolveModuleNames as any) !(
+              moduleNames, containingFile, reusedNames, redirectedReference, options);
     }
     if (delegate.resolveTypeReferenceDirectives) {
       // Backward compatibility with TypeScript 2.9 and older since return
@@ -56,10 +58,12 @@ export class GeneratedShimsHostWrapper implements ts.CompilerHost {
     }
   }
 
+  // FIXME: Additional options param is needed in TS3.6, but not alloowed in 3.5.
+  // Make the options param non-optional once google3 is fully on TS3.6.
   resolveModuleNames?:
       (moduleNames: string[], containingFile: string, reusedNames: string[],
        redirectedReference: ts.ResolvedProjectReference,
-       options: ts.CompilerOptions) => (ts.ResolvedModule | undefined)[];
+       options?: ts.CompilerOptions) => (ts.ResolvedModule | undefined)[];
 
   resolveTypeReferenceDirectives?:
       (names: string[], containingFile: string) => ts.ResolvedTypeReferenceDirective[];
diff --git a/packages/compiler-cli/src/ngtsc/util/src/typescript.ts b/packages/compiler-cli/src/ngtsc/util/src/typescript.ts
@@ -113,8 +113,10 @@ export function resolveModuleName(
     moduleName: string, containingFile: string, compilerOptions: ts.CompilerOptions,
     compilerHost: ts.CompilerHost): ts.ResolvedModule|undefined {
   if (compilerHost.resolveModuleNames) {
-    return compilerHost.resolveModuleNames(
-        [moduleName], containingFile, undefined, undefined, compilerOptions)[0];
+    // FIXME: Additional parameters are required in TS3.6, but ignored in 3.5.
+    // Remove the any cast once google3 is fully on TS3.6.
+    return (compilerHost as any)
+        .resolveModuleNames([moduleName], containingFile, undefined, undefined, compilerOptions)[0];
   } else {
     return ts.resolveModuleName(moduleName, containingFile, compilerOptions, compilerHost)
         .resolvedModule;

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,8 @@ export class NgtscProgram implements api.Program {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`if (generators.length > 0) {`
`150`		`- this.host = new GeneratedShimsHostWrapper(host, generators);`
	`150`	`+ // FIXME: Remove the any cast once google3 is fully on TS3.6.`
	`151`	`+ this.host = (new GeneratedShimsHostWrapper(host, generators) as any);`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`this.tsProgram =`