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

fix(compiler): generate correct imports for type check blocks (#19582) 

Fixes: #19485

PR Close #19582
This commit is contained in:
Chuck Jazdzewski 2017-10-05 14:36:15 -07:00 committed by Tobias Bosch
parent d035175cdb
commit 60bdcd6f5f
3 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/compiler-cli/integrationtest/test/i18n_spec.ts
View File

@ -34,10 +34,10 @@ const EXPECTED_XMB = `<?xml version="1.0" encoding="UTF-8" ?>
<!ELEMENT ex (#PCDATA)> <!ELEMENT ex (#PCDATA)>
]> ]>
<messagebundle> <messagebundle>
<msg id="8136548302122759730" desc="desc" meaning="meaning"><source>src/basic.ts:1</source>translate me</msg>
<msg id="3492007542396725315"><source>src/basic.ts:5</source><source>src/entry_components.ts:1</source>Welcome</msg>
<msg id="126808141597411718"><source>node_modules/third_party/other_comp.d.ts:1,2</source>other-3rdP-component <msg id="126808141597411718"><source>node_modules/third_party/other_comp.d.ts:1,2</source>other-3rdP-component
multi-lines</msg> multi-lines</msg>
<msg id="8136548302122759730" desc="desc" meaning="meaning"><source>src/basic.ts:1</source>translate me</msg>
<msg id="3492007542396725315"><source>src/basic.ts:5</source><source>src/entry_components.ts:1</source>Welcome</msg>
</messagebundle> </messagebundle>
`; `;
@ -45,6 +45,14 @@ const EXPECTED_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"> <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file source-language="fr" datatype="plaintext" original="ng2.template"> <file source-language="fr" datatype="plaintext" original="ng2.template">
<body> <body>
<trans-unit id="b0a17f08a4bd742b2acf39780c257c2f519d33ed" datatype="html">
<source>other-3rdP-component
multi-lines</source>
<context-group purpose="location">
<context context-type="sourcefile">node_modules/third_party/other_comp.d.ts</context>
<context context-type="linenumber">1</context>
</context-group>
</trans-unit>
<trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html"> <trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html">
<source>translate me</source> <source>translate me</source>
<context-group purpose="location"> <context-group purpose="location">
@ -65,14 +73,6 @@ const EXPECTED_XLIFF = `<?xml version="1.0" encoding="UTF-8" ?>
<context context-type="linenumber">1</context> <context context-type="linenumber">1</context>
</context-group> </context-group>
</trans-unit> </trans-unit>
<trans-unit id="b0a17f08a4bd742b2acf39780c257c2f519d33ed" datatype="html">
<source>other-3rdP-component
multi-lines</source>
<context-group purpose="location">
<context context-type="sourcefile">node_modules/third_party/other_comp.d.ts</context>
<context context-type="linenumber">1</context>
</context-group>
</trans-unit>
</body> </body>
</file> </file>
</xliff> </xliff>
@ -81,6 +81,15 @@ multi-lines</source>
const EXPECTED_XLIFF2 = `<?xml version="1.0" encoding="UTF-8" ?> const EXPECTED_XLIFF2 = `<?xml version="1.0" encoding="UTF-8" ?>
<xliff version="2.0" xmlns="urn:oasis:names:tc:xliff:document:2.0" srcLang="en"> <xliff version="2.0" xmlns="urn:oasis:names:tc:xliff:document:2.0" srcLang="en">
<file original="ng.template" id="ngi18n"> <file original="ng.template" id="ngi18n">
<unit id="126808141597411718">
<notes>
<note category="location">node_modules/third_party/other_comp.d.ts:1,2</note>
</notes>
<segment>
<source>other-3rdP-component
multi-lines</source>
</segment>
</unit>
<unit id="8136548302122759730"> <unit id="8136548302122759730">
<notes> <notes>
<note category="description">desc</note> <note category="description">desc</note>
@ -100,15 +109,6 @@ const EXPECTED_XLIFF2 = `<?xml version="1.0" encoding="UTF-8" ?>
<source>Welcome</source> <source>Welcome</source>
</segment> </segment>
</unit> </unit>
<unit id="126808141597411718">
<notes>
<note category="location">node_modules/third_party/other_comp.d.ts:1,2</note>
</notes>
<segment>
<source>other-3rdP-component
multi-lines</source>
</segment>
</unit>
</file> </file>
</xliff> </xliff>
`; `;

31
packages/compiler-cli/test/diagnostics/check_types_spec.ts
View File

@ -114,6 +114,11 @@ describe('ng type checker', () => {
() => { a('{{maybePerson!.name}}'); }); () => { a('{{maybePerson!.name}}'); });
it('should accept a safe property access of a nullable person', it('should accept a safe property access of a nullable person',
() => { a('{{maybePerson?.name}}'); }); () => { a('{{maybePerson?.name}}'); });
it('should accept using a library pipe', () => { a('{{1 | libPipe}}'); });
it('should accept using a library directive',
() => { a('<div libDir #libDir="libDir">{{libDir.name}}</div>'); });
it('should accept a function call', () => { a('{{getName()}}'); }); it('should accept a function call', () => { a('{{getName()}}'); });
it('should reject an invalid method', () => { it('should reject an invalid method', () => {
r('<div>{{getFame()}}</div>', r('<div>{{getFame()}}</div>',
@ -211,13 +216,37 @@ function appComponentSource(): string {
const QUICKSTART = { const QUICKSTART = {
'src/app.component.ts': appComponentSource(), 'src/app.component.ts': appComponentSource(),
'src/app.component.html': '<h1>Hello {{name}}</h1>', 'src/app.component.html': '<h1>Hello {{name}}</h1>',
'src/lib.ts': `
import {Pipe, Directive} from '@angular/core';
@Pipe({ name: 'libPipe' })
export class LibPipe {
transform(n: number): number { return n + 1; }
}
@Directive({
selector: '[libDir]',
exportAs: 'libDir'
})
export class LibDirective {
name: string;
}
`,
'src/app.module.ts': ` 'src/app.module.ts': `
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { AppComponent, APipe, ADirective } from './app.component'; import { AppComponent, APipe, ADirective } from './app.component';
import { LibDirective, LibPipe } from './lib';
@NgModule({
declarations: [ LibPipe, LibDirective ],
exports: [ LibPipe, LibDirective ],
})
export class LibModule { }
@NgModule({ @NgModule({
declarations: [ AppComponent, APipe, ADirective ], declarations: [ AppComponent, APipe, ADirective ],
bootstrap: [ AppComponent ] bootstrap: [ AppComponent ],
imports: [ LibModule ]
}) })
export class AppModule { } export class AppModule { }
` `

4
packages/compiler/src/aot/compiler.ts
View File

@ -204,8 +204,8 @@ export class AotCompiler {
// and they also cause TypeScript to include these files into the program too, // and they also cause TypeScript to include these files into the program too,
// which will make them part of the analyzedFiles. // which will make them part of the analyzedFiles.
const externalReferences: StaticSymbol[] = [ const externalReferences: StaticSymbol[] = [
...ngModuleMeta.declaredDirectives.map(d => d.reference), ...ngModuleMeta.transitiveModule.directives.map(d => d.reference),
...ngModuleMeta.declaredPipes.map(d => d.reference), ...ngModuleMeta.transitiveModule.pipes.map(d => d.reference),
...ngModuleMeta.importedModules.map(m => m.type.reference), ...ngModuleMeta.importedModules.map(m => m.type.reference),
...ngModuleMeta.exportedModules.map(m => m.type.reference), ...ngModuleMeta.exportedModules.map(m => m.type.reference),
]; ];