fix(ivy): let ngtsc's shim host delegate `resolveModuleNames` method (#30068)
Now that ngtsc performs type checking using a dedicated `__ng_typecheck__.ts` file, `NgtscProgram` always wraps its `ts.CompilerHost` in a shim host. This shim fails to delegate `resolveModuleNames` so no custom module resolution logic is considered. This introduces a problem for the CLI, as the compiler host it passes kicks of ngcc for any imported module such that Ivy's compatibility compiler runs automatically behind the scenes. This commit adds delegation of the `resolveModuleNames` to fix the issue. Fixes #30064 PR Close #30068
This commit is contained in:
parent
4ca95641ee
commit
c4dd2d115b
|
@ -32,6 +32,13 @@ export interface ShimGenerator {
|
||||||
*/
|
*/
|
||||||
export class GeneratedShimsHostWrapper implements ts.CompilerHost {
|
export class GeneratedShimsHostWrapper implements ts.CompilerHost {
|
||||||
constructor(private delegate: ts.CompilerHost, private shimGenerators: ShimGenerator[]) {
|
constructor(private delegate: ts.CompilerHost, private shimGenerators: ShimGenerator[]) {
|
||||||
|
if (delegate.resolveModuleNames !== undefined) {
|
||||||
|
this.resolveModuleNames =
|
||||||
|
(moduleNames: string[], containingFile: string, reusedNames?: string[],
|
||||||
|
redirectedReference?: ts.ResolvedProjectReference) =>
|
||||||
|
delegate.resolveModuleNames !(
|
||||||
|
moduleNames, containingFile, reusedNames, redirectedReference);
|
||||||
|
}
|
||||||
if (delegate.resolveTypeReferenceDirectives) {
|
if (delegate.resolveTypeReferenceDirectives) {
|
||||||
// Backward compatibility with TypeScript 2.9 and older since return
|
// Backward compatibility with TypeScript 2.9 and older since return
|
||||||
// type has changed from (ts.ResolvedTypeReferenceDirective | undefined)[]
|
// type has changed from (ts.ResolvedTypeReferenceDirective | undefined)[]
|
||||||
|
@ -50,6 +57,10 @@ export class GeneratedShimsHostWrapper implements ts.CompilerHost {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resolveModuleNames?:
|
||||||
|
(moduleNames: string[], containingFile: string, reusedNames?: string[],
|
||||||
|
redirectedReference?: ts.ResolvedProjectReference) => (ts.ResolvedModule | undefined)[];
|
||||||
|
|
||||||
resolveTypeReferenceDirectives?:
|
resolveTypeReferenceDirectives?:
|
||||||
(names: string[], containingFile: string) => ts.ResolvedTypeReferenceDirective[];
|
(names: string[], containingFile: string) => ts.ResolvedTypeReferenceDirective[];
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
/**
|
||||||
|
* @license
|
||||||
|
* Copyright Google Inc. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Use of this source code is governed by an MIT-style license that can be
|
||||||
|
* found in the LICENSE file at https://angular.io/license
|
||||||
|
*/
|
||||||
|
import * as ts from 'typescript';
|
||||||
|
|
||||||
|
import {GeneratedShimsHostWrapper} from '../src/host';
|
||||||
|
|
||||||
|
describe('shim host', () => {
|
||||||
|
it('should not have optional methods when delegate does not have them', function() {
|
||||||
|
const delegate = {} as unknown as ts.CompilerHost;
|
||||||
|
const shimsHost = new GeneratedShimsHostWrapper(delegate, []);
|
||||||
|
|
||||||
|
expect(shimsHost.resolveModuleNames).not.toBeDefined();
|
||||||
|
expect(shimsHost.resolveTypeReferenceDirectives).not.toBeDefined();
|
||||||
|
expect(shimsHost.directoryExists).not.toBeDefined();
|
||||||
|
expect(shimsHost.getDirectories).not.toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should delegate optional methods if available', function() {
|
||||||
|
const delegate = {
|
||||||
|
resolveModuleNames: () => undefined,
|
||||||
|
resolveTypeReferenceDirectives: () => undefined,
|
||||||
|
directoryExists: () => undefined,
|
||||||
|
getDirectories: () => undefined,
|
||||||
|
} as unknown as ts.CompilerHost;
|
||||||
|
const shimsHost = new GeneratedShimsHostWrapper(delegate, []);
|
||||||
|
|
||||||
|
expect(shimsHost.resolveModuleNames).toBeDefined();
|
||||||
|
expect(shimsHost.resolveTypeReferenceDirectives).toBeDefined();
|
||||||
|
expect(shimsHost.directoryExists).toBeDefined();
|
||||||
|
expect(shimsHost.getDirectories).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
Loading…
Reference in New Issue