honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style(ivy): ngcc - fix misspelled method (#26906) 

PR Close #26906
This commit is contained in:
Pete Bacon Darwin 2018-11-13 14:40:54 +00:00 committed by Igor Minar
parent 84ce45ca16
commit b93c1dffa1
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/compiler-cli/src/ngcc/src/packages/dependency_host.ts
View File

@ -28,7 +28,7 @@ export class DependencyHost {
from: string, resolved: Set<string>, missing: Set<string>, deepImports: Set<string>, from: string, resolved: Set<string>, missing: Set<string>, deepImports: Set<string>,
internal: Set<string> = new Set()): void { internal: Set<string> = new Set()): void {
const fromContents = fs.readFileSync(from, 'utf8'); const fromContents = fs.readFileSync(from, 'utf8');
if (!this.hasImportOrReeportStatements(fromContents)) { if (!this.hasImportOrReexportStatements(fromContents)) {
return; return;
} }
@ -142,7 +142,7 @@ export class DependencyHost {
* @returns false if there are definitely no import or re-export statements * @returns false if there are definitely no import or re-export statements
* in this file, true otherwise. * in this file, true otherwise.
*/ */
hasImportOrReeportStatements(source: string): boolean { hasImportOrReexportStatements(source: string): boolean {
return /(import|export)\s.+from/.test(source); return /(import|export)\s.+from/.test(source);
} }
} }

25
packages/compiler-cli/src/ngcc/test/packages/dependency_host_spec.ts
View File

@ -222,29 +222,30 @@ describe('DependencyHost', () => {
} }
}); });
describe('hasImportOrReeportStatements', () => { describe('hasImportOrReexportStatements', () => {
it('should return true if there is an import statement', () => { it('should return true if there is an import statement', () => {
expect(host.hasImportOrReeportStatements('import {X} from "some/x";')).toBe(true); expect(host.hasImportOrReexportStatements('import {X} from "some/x";')).toBe(true);
expect(host.hasImportOrReeportStatements('import * as X from "some/x";')).toBe(true); expect(host.hasImportOrReexportStatements('import * as X from "some/x";')).toBe(true);
expect( expect(
host.hasImportOrReeportStatements('blah blah\n\n import {X} from "some/x";\nblah blah')) host.hasImportOrReexportStatements('blah blah\n\n import {X} from "some/x";\nblah blah'))
.toBe(true); .toBe(true);
expect(host.hasImportOrReeportStatements('\t\timport {X} from "some/x";')).toBe(true); expect(host.hasImportOrReexportStatements('\t\timport {X} from "some/x";')).toBe(true);
}); });
it('should return true if there is a re-export statement', () => { it('should return true if there is a re-export statement', () => {
expect(host.hasImportOrReeportStatements('export {X} from "some/x";')).toBe(true); expect(host.hasImportOrReexportStatements('export {X} from "some/x";')).toBe(true);
expect( expect(
host.hasImportOrReeportStatements('blah blah\n\n export {X} from "some/x";\nblah blah')) host.hasImportOrReexportStatements('blah blah\n\n export {X} from "some/x";\nblah blah'))
.toBe(true); .toBe(true);
expect(host.hasImportOrReeportStatements('\t\texport {X} from "some/x";')).toBe(true); expect(host.hasImportOrReexportStatements('\t\texport {X} from "some/x";')).toBe(true);
expect(host.hasImportOrReeportStatements( expect(host.hasImportOrReexportStatements(
'blah blah\n\n export * from "@angular/core;\nblah blah')) 'blah blah\n\n export * from "@angular/core;\nblah blah'))
.toBe(true); .toBe(true);
}); });
it('should return false if there is no import nor re-export statement', () => { it('should return false if there is no import nor re-export statement', () => {
expect(host.hasImportOrReeportStatements('blah blah')).toBe(false); expect(host.hasImportOrReexportStatements('blah blah')).toBe(false);
expect(host.hasImportOrReeportStatements('export function moo() {}')).toBe(false); expect(host.hasImportOrReexportStatements('export function moo() {}')).toBe(false);
expect(host.hasImportOrReeportStatements('Some text that happens to include the word import')) expect(
host.hasImportOrReexportStatements('Some text that happens to include the word import'))
.toBe(false); .toBe(false);
}); });
}); });