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

feat(ivy): support getting the corresponding .d.ts file in ngcc (#25406)

Browse Source 
PR Close #25406
This commit is contained in:
George Kalpakas
2018-07-30 15:23:22 +03:00
committed by Matias Niemelä
parent cdb0215d0b
commit d6e91ba545
4 changed files with 154 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
packages/compiler-cli/src/ngcc/test/parsing/utils_spec.ts
View File

@ -7,12 +7,16 @@
*/
import * as mockFs from 'mock-fs';
import {findAllPackageJsonFiles, getEntryPoints} from '../../src/parsing/utils';
import {EntryPoint, findAllPackageJsonFiles, getEntryPoints} from '../../src/parsing/utils';
function createMockFileSystem() {
mockFs({
'/node_modules/@angular/common': {
'package.json': '{ "fesm2015": "./fesm2015/common.js", "fesm5": "./fesm5/common.js" }',
'package.json': `{
"fesm2015": "./fesm2015/common.js",
"fesm5": "./fesm5/common.js",
"typings": "./common.d.ts"
}`,
'fesm2015': {
'common.js': 'DUMMY CONTENT',
'http.js': 'DUMMY CONTENT',
@ -20,14 +24,28 @@ function createMockFileSystem() {
'testing.js': 'DUMMY CONTENT',
},
'http': {
'package.json': '{ "fesm2015": "../fesm2015/http.js", "fesm5": "../fesm5/http.js" }',
'package.json': `{
"fesm2015": "../fesm2015/http.js",
"fesm5": "../fesm5/http.js",
"typings": "./http.d.ts"
}`,
'testing': {
'package.json':
'{ "fesm2015": "../../fesm2015/http/testing.js", "fesm5": "../../fesm5/http/testing.js" }',
'package.json': `{
"fesm2015": "../../fesm2015/http/testing.js",
"fesm5": "../../fesm5/http/testing.js",
"no-typings": "for testing purposes"
}`,
},
},
'other': {
'package.json': '{ }',
},
'testing': {
'package.json': '{ "fesm2015": "../fesm2015/testing.js", "fesm5": "../fesm5/testing.js" }',
'package.json': `{
"fesm2015": "../fesm2015/testing.js",
"fesm5": "../fesm5/testing.js",
"no-typings": "for testing purposes"
}`,
},
'node_modules': {
'tslib': {
@ -63,6 +81,29 @@ function restoreRealFileSystem() {
mockFs.restore();
}
describe('EntryPoint', () => {
it('should not break when called without a `relativeDtsEntryPath`',
() => { expect(() => new EntryPoint('/foo', './bar')).not.toThrow(); });
it('should expose the absolute path to the entry point file', () => {
const entryPoint = new EntryPoint('/foo/bar', '../baz/qux/../quux.js');
expect(entryPoint.entryFileName).toBe('/foo/baz/quux.js');
});
describe('.getDtsFileNameFor()', () => {
it('should throw if no `.d.ts` entry path was specified', () => {
const entryPoint = new EntryPoint('/foo/bar', '../baz/qux.js');
expect(() => entryPoint.getDtsFileNameFor('test'))
.toThrowError('No `.d.ts` entry path was specified.');
});
it('should return the absolute path to the corresponding `.d.ts` file', () => {
const entryPoint = new EntryPoint('/foo/bar', '../src/entry.js', '../dts/entry.d.ts');
expect(entryPoint.getDtsFileNameFor('/foo/src/qu/x.js')).toBe('/foo/dts/qu/x.d.ts');
});
});
});
describe('findAllPackageJsonFiles()', () => {
beforeEach(createMockFileSystem);
afterEach(restoreRealFileSystem);
@ -72,6 +113,7 @@ describe('findAllPackageJsonFiles()', () => {
expect(paths.sort()).toEqual([
'/node_modules/@angular/common/http/package.json',
'/node_modules/@angular/common/http/testing/package.json',
'/node_modules/@angular/common/other/package.json',
'/node_modules/@angular/common/package.json',
'/node_modules/@angular/common/testing/package.json',
]);
@ -102,9 +144,12 @@ describe('getEntryPoints()', () => {
beforeEach(createMockFileSystem);
afterEach(restoreRealFileSystem);
it('should return the paths for the specified format from each package.json', () => {
const paths = getEntryPoints('/node_modules/@angular/common', 'fesm2015');
expect(paths.sort()).toEqual([
it('should return the entry points for the specified format from each `package.json`', () => {
const entryPoints = getEntryPoints('/node_modules/@angular/common', 'fesm2015');
entryPoints.forEach(ep => expect(ep).toEqual(jasmine.any(EntryPoint)));
const sortedPaths = entryPoints.map(x => x.entryFileName).sort();
expect(sortedPaths).toEqual([
'/node_modules/@angular/common/fesm2015/common.js',
'/node_modules/@angular/common/fesm2015/http.js',
'/node_modules/@angular/common/fesm2015/http/testing.js',
@ -112,13 +157,30 @@ describe('getEntryPoints()', () => {
]);
});
it('should return an empty array if there are no matching package.json files', () => {
const paths = getEntryPoints('/node_modules/@angular/other', 'fesm2015');
expect(paths).toEqual([]);
it('should return an empty array if there are no matching `package.json` files', () => {
const entryPoints = getEntryPoints('/node_modules/@angular/other', 'fesm2015');
expect(entryPoints).toEqual([]);
});
it('should return an empty array if there are no matching formats', () => {
const paths = getEntryPoints('/node_modules/@angular/other', 'main');
expect(paths).toEqual([]);
const entryPoints = getEntryPoints('/node_modules/@angular/common', 'fesm3000');
expect(entryPoints).toEqual([]);
});
it('should return an entry point even if the typings are not specified', () => {
const entryPoints = getEntryPoints('/node_modules/@angular/common/http', 'fesm2015');
const sortedEntryPoints =
entryPoints.sort((a, b) => (a.entryFileName > b.entryFileName) ? 1 : -1);
const sortedPaths = sortedEntryPoints.map(x => x.entryFileName);
expect(sortedPaths).toEqual([
'/node_modules/@angular/common/fesm2015/http.js',
'/node_modules/@angular/common/fesm2015/http/testing.js',
]);
expect(() => sortedEntryPoints[0].getDtsFileNameFor(sortedEntryPoints[0].entryFileName))
.not.toThrow();
expect(() => sortedEntryPoints[1].getDtsFileNameFor(sortedEntryPoints[1].entryFileName))
.toThrow();
});
});