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

fix(ngcc): correctly include internal .d.ts files (#33875)

Browse Source 
Some declaration files may not be referenced from an entry-point's
main typings file, as it may declare types that are only used internally.
ngcc has logic to include declaration files based on all source files,
to ensure internal declaration files are available.

For packages following APF layout, however, this logic was insufficient.
Consider an entry-point with base path of `/esm2015/testing` and typings
residing in `/testing`, the file
`/esm2015/testing/src/nested/internal.js` has its typings file at
`/testing/src/nested/internal.d.ts`. Previously, the declaration was
assumed to be located at `/esm2015/testing/testing/internal.d.ts` (by
means of `/esm2015/testing/src/nested/../../testing/internal.d.ts`)
which is not where the declaration file can be found. This commit
resolves the issue by looking in the correct directory.

PR Close #33875
This commit is contained in:
JoostK
2019-11-16 20:59:48 +01:00
committed by Alex Rickabaugh
parent 023c4ffdde
commit 985cadb73d
2 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/compiler-cli/ngcc/src/packages/entry_point_bundle.ts
View File

@ -73,16 +73,20 @@ export function makeEntryPointBundle(
function computePotentialDtsFilesFromJsFiles(
fs: FileSystem, srcProgram: ts.Program, formatPath: AbsoluteFsPath,
typingsPath: AbsoluteFsPath) {
const relativePath = fs.relative(fs.dirname(formatPath), fs.dirname(typingsPath));
const formatRoot = fs.dirname(formatPath);
const typingsRoot = fs.dirname(typingsPath);
const additionalFiles: AbsoluteFsPath[] = [];
for (const sf of srcProgram.getSourceFiles()) {
if (!sf.fileName.endsWith('.js')) {
continue;
}
const dtsPath = fs.resolve(
fs.dirname(sf.fileName), relativePath, fs.basename(sf.fileName, '.js') + '.d.ts');
if (fs.exists(dtsPath)) {
additionalFiles.push(dtsPath);
// Given a source file at e.g. `esm2015/src/some/nested/index.js`, try to resolve the
// declaration file under the typings root in `src/some/nested/index.d.ts`.
const mirroredDtsPath =
fs.resolve(typingsRoot, fs.relative(formatRoot, sf.fileName.replace(/\.js$/, '.d.ts')));
if (fs.exists(mirroredDtsPath)) {
additionalFiles.push(mirroredDtsPath);
}
}
return additionalFiles;