2018-04-06 12:53:10 -04:00
|
|
|
/**
|
|
|
|
* @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
|
|
|
|
*/
|
|
|
|
|
2019-02-05 09:47:35 -05:00
|
|
|
import {LazyRoute} from '@angular/compiler-cli/src/ngtsc/routing';
|
|
|
|
import * as path from 'path';
|
2018-12-13 14:52:20 -05:00
|
|
|
import * as ts from 'typescript';
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
import {NgtscTestEnvironment} from './env';
|
2018-04-06 12:53:10 -04:00
|
|
|
|
2018-11-20 18:20:19 -05:00
|
|
|
const trim = (input: string): string => input.replace(/\s+/g, ' ').trim();
|
|
|
|
|
2019-01-23 14:54:43 -05:00
|
|
|
const varRegExp = (name: string): RegExp => new RegExp(`var \\w+ = \\[\"${name}\"\\];`);
|
|
|
|
|
|
|
|
const viewQueryRegExp = (descend: boolean, ref?: string): RegExp => {
|
2019-02-18 20:33:59 -05:00
|
|
|
const maybeRef = ref ? `${ref}` : `null`;
|
2019-04-19 12:52:21 -04:00
|
|
|
return new RegExp(`i0\\.\u0275\u0275viewQuery\\(\\w+, ${descend}, ${maybeRef}\\)`);
|
2019-01-23 14:54:43 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
const contentQueryRegExp = (predicate: string, descend: boolean, ref?: string): RegExp => {
|
2019-02-18 20:33:59 -05:00
|
|
|
const maybeRef = ref ? `${ref}` : `null`;
|
2019-04-19 12:52:21 -04:00
|
|
|
return new RegExp(
|
|
|
|
`i0\\.\u0275\u0275contentQuery\\(dirIndex, ${predicate}, ${descend}, ${maybeRef}\\)`);
|
2019-01-23 14:54:43 -05:00
|
|
|
};
|
|
|
|
|
2019-02-22 21:06:25 -05:00
|
|
|
const setClassMetadataRegExp = (expectedType: string): RegExp =>
|
|
|
|
new RegExp(`setClassMetadata(.*?${expectedType}.*?)`);
|
|
|
|
|
2018-04-06 12:53:10 -04:00
|
|
|
describe('ngtsc behavioral tests', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
let env !: NgtscTestEnvironment;
|
2018-04-06 12:53:10 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
beforeEach(() => { env = NgtscTestEnvironment.setup(); });
|
2018-04-06 12:53:10 -04:00
|
|
|
|
2018-05-31 18:50:02 -04:00
|
|
|
it('should compile Injectables without errors', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-04-06 12:53:10 -04:00
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class Dep {}
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class Service {
|
|
|
|
constructor(dep: Dep) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-04-06 12:53:10 -04:00
|
|
|
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
2018-04-06 12:53:10 -04:00
|
|
|
expect(jsContents).toContain('Dep.ngInjectableDef =');
|
|
|
|
expect(jsContents).toContain('Service.ngInjectableDef =');
|
|
|
|
expect(jsContents).not.toContain('__decorate');
|
2018-09-25 18:35:03 -04:00
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Dep>;');
|
|
|
|
expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Service>;');
|
2018-04-06 12:53:10 -04:00
|
|
|
});
|
2018-05-31 18:50:02 -04:00
|
|
|
|
2018-11-09 20:58:33 -05:00
|
|
|
it('should compile Injectables with a generic service', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class Store<T> {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('Store.ngInjectableDef =');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(dtsContents)
|
|
|
|
.toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Store<any>>;');
|
2018-11-09 20:58:33 -05:00
|
|
|
});
|
|
|
|
|
2019-01-11 08:50:26 -05:00
|
|
|
it('should compile Injectables with providedIn without errors', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class Dep {}
|
|
|
|
|
|
|
|
@Injectable({ providedIn: 'root' })
|
|
|
|
export class Service {
|
|
|
|
constructor(dep: Dep) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('Dep.ngInjectableDef =');
|
|
|
|
expect(jsContents).toContain('Service.ngInjectableDef =');
|
|
|
|
expect(jsContents)
|
2019-04-19 12:52:21 -04:00
|
|
|
.toContain(
|
|
|
|
'return new (t || Service)(i0.\u0275\u0275inject(Dep)); }, providedIn: \'root\' });');
|
2019-01-11 08:50:26 -05:00
|
|
|
expect(jsContents).not.toContain('__decorate');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Dep>;');
|
|
|
|
expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Service>;');
|
2019-01-11 08:50:26 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile Injectables with providedIn and factory without errors', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable({ providedIn: 'root', useFactory: () => new Service() })
|
|
|
|
export class Service {
|
|
|
|
constructor() {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('Service.ngInjectableDef =');
|
|
|
|
expect(jsContents).toContain('(r = new t());');
|
|
|
|
expect(jsContents).toContain('(r = (function () { return new Service(); })());');
|
|
|
|
expect(jsContents).toContain('factory: function Service_Factory(t) { var r = null; if (t) {');
|
|
|
|
expect(jsContents).toContain('return r; }, providedIn: \'root\' });');
|
|
|
|
expect(jsContents).not.toContain('__decorate');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Service>;');
|
2019-01-11 08:50:26 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile Injectables with providedIn and factory with deps without errors', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class Dep {}
|
|
|
|
|
|
|
|
@Injectable({ providedIn: 'root', useFactory: (dep: Dep) => new Service(dep), deps: [Dep] })
|
|
|
|
export class Service {
|
|
|
|
constructor(dep: Dep) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('Service.ngInjectableDef =');
|
|
|
|
expect(jsContents).toContain('factory: function Service_Factory(t) { var r = null; if (t) {');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('(r = new t(i0.\u0275\u0275inject(Dep)));');
|
2019-01-11 08:50:26 -05:00
|
|
|
expect(jsContents)
|
2019-04-19 12:52:21 -04:00
|
|
|
.toContain(
|
|
|
|
'(r = (function (dep) { return new Service(dep); })(i0.\u0275\u0275inject(Dep)));');
|
2019-01-11 08:50:26 -05:00
|
|
|
expect(jsContents).toContain('return r; }, providedIn: \'root\' });');
|
|
|
|
expect(jsContents).not.toContain('__decorate');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(dtsContents).toContain('static ngInjectableDef: i0.\u0275\u0275InjectableDef<Service>;');
|
2019-01-11 08:50:26 -05:00
|
|
|
});
|
|
|
|
|
2019-03-01 14:40:42 -05:00
|
|
|
it('should compile @Injectable with an @Optional dependency', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable, Optional as Opt} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
class Dep {}
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
class Service {
|
|
|
|
constructor(@Opt() dep: Dep) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('inject(Dep, 8)');
|
|
|
|
});
|
|
|
|
|
2019-02-08 17:10:21 -05:00
|
|
|
it('should compile Components (inline template) without errors', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-05-31 18:50:02 -04:00
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
template: 'this is a test',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-05-31 18:50:02 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('TestCmp.ngComponentDef = i0.\u0275\u0275defineComponent');
|
2018-05-31 18:50:02 -04:00
|
|
|
expect(jsContents).not.toContain('__decorate');
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2018-09-21 15:12:06 -04:00
|
|
|
expect(dtsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'static ngComponentDef: i0.\u0275\u0275ComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
|
2018-05-31 18:50:02 -04:00
|
|
|
});
|
|
|
|
|
2019-02-08 17:10:21 -05:00
|
|
|
it('should compile Components (dynamic inline template) without errors', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
template: 'this is ' + 'a test',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('TestCmp.ngComponentDef = i0.\u0275\u0275defineComponent');
|
2019-02-08 17:10:21 -05:00
|
|
|
expect(jsContents).not.toContain('__decorate');
|
|
|
|
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
|
|
|
expect(dtsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'static ngComponentDef: i0.\u0275\u0275ComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
|
2019-02-08 17:10:21 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile Components (function call inline template) without errors', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
function getTemplate() {
|
|
|
|
return 'this is a test';
|
|
|
|
}
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
template: getTemplate(),
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('TestCmp.ngComponentDef = i0.\u0275\u0275defineComponent');
|
2019-02-08 17:10:21 -05:00
|
|
|
expect(jsContents).not.toContain('__decorate');
|
|
|
|
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
|
|
|
expect(dtsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'static ngComponentDef: i0.\u0275\u0275ComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
|
2019-02-08 17:10:21 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile Components (external template) without errors', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-06-26 18:01:09 -04:00
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
templateUrl: './dir/test.html',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
2018-09-25 18:35:03 -04:00
|
|
|
env.write('dir/test.html', '<p>Hello World</p>');
|
2018-06-26 18:01:09 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-06-26 18:01:09 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
2018-06-26 18:01:09 -04:00
|
|
|
expect(jsContents).toContain('Hello World');
|
|
|
|
});
|
|
|
|
|
2019-01-10 13:40:24 -05:00
|
|
|
it('should add @nocollapse to static fields when closure annotations are requested', () => {
|
|
|
|
env.tsconfig({
|
|
|
|
'annotateForClosureCompiler': true,
|
|
|
|
});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
templateUrl: './dir/test.html',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
env.write('dir/test.html', '<p>Hello World</p>');
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('/** @nocollapse */ TestCmp.ngComponentDef');
|
|
|
|
});
|
|
|
|
|
2019-03-08 18:32:31 -05:00
|
|
|
it('should recognize aliased decorators', () => {
|
|
|
|
env.tsconfig({});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {
|
|
|
|
Component as AngularComponent,
|
|
|
|
Directive as AngularDirective,
|
|
|
|
Pipe as AngularPipe,
|
|
|
|
Injectable as AngularInjectable,
|
|
|
|
NgModule as AngularNgModule,
|
|
|
|
Input as AngularInput,
|
|
|
|
Output as AngularOutput
|
|
|
|
} from '@angular/core';
|
|
|
|
|
|
|
|
export class TestBase {
|
|
|
|
@AngularInput() input: any;
|
|
|
|
@AngularOutput() output: any;
|
|
|
|
}
|
|
|
|
|
|
|
|
@AngularComponent({
|
|
|
|
selector: 'test-component',
|
|
|
|
template: '...'
|
|
|
|
})
|
|
|
|
export class TestComponent {
|
|
|
|
@AngularInput() input: any;
|
|
|
|
@AngularOutput() output: any;
|
|
|
|
}
|
|
|
|
|
|
|
|
@AngularDirective({
|
|
|
|
selector: 'test-directive'
|
|
|
|
})
|
|
|
|
export class TestDirective {}
|
|
|
|
|
|
|
|
@AngularPipe({
|
|
|
|
name: 'test-pipe'
|
|
|
|
})
|
|
|
|
export class TestPipe {}
|
|
|
|
|
|
|
|
@AngularInjectable({})
|
|
|
|
export class TestInjectable {}
|
|
|
|
|
|
|
|
@AngularNgModule({
|
|
|
|
declarations: [
|
|
|
|
TestComponent,
|
|
|
|
TestDirective,
|
|
|
|
TestPipe
|
|
|
|
],
|
|
|
|
exports: [
|
|
|
|
TestComponent,
|
|
|
|
TestDirective,
|
|
|
|
TestPipe
|
|
|
|
]
|
|
|
|
})
|
|
|
|
class MyModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('TestBase.ngBaseDef = i0.\u0275\u0275defineBase');
|
|
|
|
expect(jsContents).toContain('TestComponent.ngComponentDef = i0.\u0275\u0275defineComponent');
|
|
|
|
expect(jsContents).toContain('TestDirective.ngDirectiveDef = i0.\u0275\u0275defineDirective');
|
|
|
|
expect(jsContents).toContain('TestPipe.ngPipeDef = i0.\u0275\u0275definePipe');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain('TestInjectable.ngInjectableDef = i0.\u0275\u0275defineInjectable');
|
|
|
|
expect(jsContents).toContain('MyModule.ngModuleDef = i0.\u0275\u0275defineNgModule');
|
|
|
|
expect(jsContents).toContain('MyModule.ngInjectorDef = i0.\u0275\u0275defineInjector');
|
2019-03-08 18:32:31 -05:00
|
|
|
expect(jsContents).toContain('inputs: { input: "input" }');
|
|
|
|
expect(jsContents).toContain('outputs: { output: "output" }');
|
|
|
|
});
|
|
|
|
|
2018-11-30 13:37:06 -05:00
|
|
|
it('should compile Components with a templateUrl in a different rootDir', () => {
|
|
|
|
env.tsconfig({}, ['./extraRootDir']);
|
|
|
|
env.write('extraRootDir/test.html', '<p>Hello World</p>');
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
templateUrl: 'test.html',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('Hello World');
|
|
|
|
});
|
|
|
|
|
2018-11-29 17:17:51 -05:00
|
|
|
it('should compile components with styleUrls', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
styleUrls: ['./dir/style.css'],
|
|
|
|
template: '',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
env.write('dir/style.css', ':host { background-color: blue; }');
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('background-color: blue');
|
|
|
|
});
|
|
|
|
|
2019-02-15 18:57:05 -05:00
|
|
|
it('should compile components with styleUrls with fallback to .css extension', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
styleUrls: ['./dir/style.scss'],
|
|
|
|
template: '',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
env.write('dir/style.css', ':host { background-color: blue; }');
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('background-color: blue');
|
|
|
|
});
|
|
|
|
|
2018-05-31 18:50:02 -04:00
|
|
|
it('should compile NgModules without errors', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-05-31 18:50:02 -04:00
|
|
|
import {Component, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
template: 'this is a test',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [TestCmp],
|
2018-08-28 17:19:33 -04:00
|
|
|
bootstrap: [TestCmp],
|
2018-05-31 18:50:02 -04:00
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-05-31 18:50:02 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
2018-05-31 18:50:02 -04:00
|
|
|
expect(jsContents)
|
2019-04-19 12:52:21 -04:00
|
|
|
.toContain('i0.\u0275\u0275defineNgModule({ type: TestModule, bootstrap: [TestCmp] });');
|
2019-04-11 16:46:47 -04:00
|
|
|
expect(jsContents)
|
2019-04-19 12:52:21 -04:00
|
|
|
.toContain(
|
|
|
|
'/*@__PURE__*/ i0.\u0275\u0275setNgModuleScope(TestModule, { declarations: [TestCmp] });');
|
2019-03-30 09:12:25 -04:00
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'i0.\u0275\u0275defineInjector({ factory: ' +
|
2019-03-30 09:12:25 -04:00
|
|
|
'function TestModule_Factory(t) { return new (t || TestModule)(); } });');
|
2018-05-31 18:50:02 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2018-05-31 18:50:02 -04:00
|
|
|
expect(dtsContents)
|
fix(ivy): use 'typeof' and 'never' for type metadata (#24862)
Previously ngtsc would use a tuple of class types for listing metadata
in .d.ts files. For example, an @NgModule's declarations might be
represented with the type:
[NgIf, NgForOf, NgClass]
If the module had no declarations, an empty tuple [] would be produced.
This has two problems.
1. If the class type has generic type parameters, TypeScript will
complain that they're not provided.
2. The empty tuple type is not actually legal.
This commit addresses both problems.
1. Class types are now represented using the `typeof` operator, so the
above declarations would be represented as:
[typeof NgIf, typeof NgForOf, typeof NgClass].
Since typeof operates on a value, it doesn't require generic type
arguments.
2. Instead of an empty tuple, `never` is used to indicate no metadata.
PR Close #24862
2018-07-17 16:34:20 -04:00
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'static ngComponentDef: i0.\u0275\u0275ComponentDefWithMeta<TestCmp, "test-cmp", never, {}, {}, never>');
|
2018-09-21 15:12:06 -04:00
|
|
|
expect(dtsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'static ngModuleDef: i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestCmp], never, never>');
|
2018-05-31 18:50:02 -04:00
|
|
|
expect(dtsContents).not.toContain('__decorate');
|
|
|
|
});
|
2018-06-18 19:28:02 -04:00
|
|
|
|
2019-04-19 12:52:21 -04:00
|
|
|
it('should not emit a \u0275\u0275setNgModuleScope call when no scope metadata is present',
|
|
|
|
() => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2019-03-29 16:31:22 -04:00
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
2019-04-19 12:52:21 -04:00
|
|
|
env.driveMain();
|
2019-03-29 16:31:22 -04:00
|
|
|
|
2019-04-19 12:52:21 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('i0.\u0275\u0275defineNgModule({ type: TestModule });');
|
|
|
|
expect(jsContents).not.toContain('\u0275\u0275setNgModuleScope(TestModule,');
|
|
|
|
});
|
2019-03-29 16:31:22 -04:00
|
|
|
|
2019-04-18 19:22:53 -04:00
|
|
|
it('should emit a \u0275registerNgModuleType call when the module has an id', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({id: 'test'})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('i0.\u0275registerNgModuleType("test", TestModule);');
|
|
|
|
});
|
|
|
|
|
2019-03-30 08:09:45 -04:00
|
|
|
it('should filter out directives and pipes from module exports in the injector def', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterComp, RouterModule} from '@angular/router';
|
|
|
|
import {Dir, OtherDir, MyPipe, Comp} from './decls';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [OtherDir],
|
|
|
|
exports: [OtherDir],
|
|
|
|
})
|
|
|
|
export class OtherModule {}
|
2019-04-04 14:41:52 -04:00
|
|
|
|
2019-03-30 08:09:45 -04:00
|
|
|
const EXPORTS = [Dir, MyPipe, Comp, OtherModule, OtherDir, RouterModule, RouterComp];
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Dir, MyPipe, Comp],
|
|
|
|
imports: [OtherModule, RouterModule.forRoot()],
|
|
|
|
exports: [EXPORTS],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
env.write(`decls.ts`, `
|
|
|
|
import {Component, Directive, Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({selector: '[dir]'})
|
|
|
|
export class Dir {}
|
|
|
|
|
|
|
|
@Directive({selector: '[other]'})
|
|
|
|
export class OtherDir {}
|
|
|
|
|
|
|
|
@Pipe({name:'pipe'})
|
|
|
|
export class MyPipe {}
|
|
|
|
|
|
|
|
@Component({selector: 'test', template: ''})
|
|
|
|
export class Comp {}
|
|
|
|
`);
|
|
|
|
env.write('node_modules/@angular/router/index.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {\u0275\u0275ComponentDefWithMeta, ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2019-03-30 08:09:45 -04:00
|
|
|
|
|
|
|
export declare class RouterComp {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngComponentDef: \u0275\u0275ComponentDefWithMeta<RouterComp, "lib-cmp", never, {}, {}, never>
|
2019-03-30 08:09:45 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
declare class RouterModule {
|
|
|
|
static forRoot(): ModuleWithProviders<RouterModule>;
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, [typeof RouterComp], never, [typeof RouterComp]>;
|
2019-03-30 08:09:45 -04:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'i0.\u0275\u0275defineInjector({ factory: function TestModule_Factory(t) ' +
|
2019-03-30 09:12:25 -04:00
|
|
|
'{ return new (t || TestModule)(); }, imports: [[OtherModule, RouterModule.forRoot()],' +
|
|
|
|
'\n OtherModule,\n RouterModule] });');
|
2019-03-30 08:09:45 -04:00
|
|
|
});
|
|
|
|
|
2018-06-18 19:28:02 -04:00
|
|
|
it('should compile NgModules with services without errors', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-06-18 19:28:02 -04:00
|
|
|
import {Component, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
export class Token {}
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class OtherModule {}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
template: 'this is a test',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [TestCmp],
|
|
|
|
providers: [{provide: Token, useValue: 'test'}],
|
|
|
|
imports: [OtherModule],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-06-18 19:28:02 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('i0.\u0275\u0275defineNgModule({ type: TestModule });');
|
2018-06-18 19:28:02 -04:00
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
`TestModule.ngInjectorDef = i0.\u0275\u0275defineInjector({ factory: ` +
|
2018-07-16 19:36:31 -04:00
|
|
|
`function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` +
|
2018-07-10 12:59:29 -04:00
|
|
|
`Token, useValue: 'test' }], imports: [[OtherModule]] });`);
|
2018-06-18 19:28:02 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2018-06-18 19:28:02 -04:00
|
|
|
expect(dtsContents)
|
fix(ivy): use 'typeof' and 'never' for type metadata (#24862)
Previously ngtsc would use a tuple of class types for listing metadata
in .d.ts files. For example, an @NgModule's declarations might be
represented with the type:
[NgIf, NgForOf, NgClass]
If the module had no declarations, an empty tuple [] would be produced.
This has two problems.
1. If the class type has generic type parameters, TypeScript will
complain that they're not provided.
2. The empty tuple type is not actually legal.
This commit addresses both problems.
1. Class types are now represented using the `typeof` operator, so the
above declarations would be represented as:
[typeof NgIf, typeof NgForOf, typeof NgClass].
Since typeof operates on a value, it doesn't require generic type
arguments.
2. Instead of an empty tuple, `never` is used to indicate no metadata.
PR Close #24862
2018-07-17 16:34:20 -04:00
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'static ngModuleDef: i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
|
|
|
|
expect(dtsContents).toContain('static ngInjectorDef: i0.\u0275\u0275InjectorDef');
|
2018-06-18 19:28:02 -04:00
|
|
|
});
|
2018-06-26 13:44:22 -04:00
|
|
|
|
2019-01-11 08:50:26 -05:00
|
|
|
it('should compile NgModules with factory providers without errors', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
export class Token {}
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class OtherModule {}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
template: 'this is a test',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [TestCmp],
|
|
|
|
providers: [{provide: Token, useFactory: () => new Token()}],
|
|
|
|
imports: [OtherModule],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('i0.\u0275\u0275defineNgModule({ type: TestModule });');
|
2019-01-11 08:50:26 -05:00
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
`TestModule.ngInjectorDef = i0.\u0275\u0275defineInjector({ factory: ` +
|
2019-01-11 08:50:26 -05:00
|
|
|
`function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` +
|
|
|
|
`Token, useFactory: function () { return new Token(); } }], imports: [[OtherModule]] });`);
|
|
|
|
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
|
|
|
expect(dtsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'static ngModuleDef: i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
|
|
|
|
expect(dtsContents).toContain('static ngInjectorDef: i0.\u0275\u0275InjectorDef');
|
2019-01-11 08:50:26 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile NgModules with factory providers and deps without errors', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, NgModule} from '@angular/core';
|
2019-01-26 06:29:38 -05:00
|
|
|
|
2019-01-11 08:50:26 -05:00
|
|
|
export class Dep {}
|
|
|
|
|
|
|
|
export class Token {
|
|
|
|
constructor(dep: Dep) {}
|
|
|
|
}
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class OtherModule {}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
template: 'this is a test',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [TestCmp],
|
|
|
|
providers: [{provide: Token, useFactory: (dep: Dep) => new Token(dep), deps: [Dep]}],
|
|
|
|
imports: [OtherModule],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('i0.\u0275\u0275defineNgModule({ type: TestModule });');
|
2019-01-11 08:50:26 -05:00
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
`TestModule.ngInjectorDef = i0.\u0275\u0275defineInjector({ factory: ` +
|
2019-01-11 08:50:26 -05:00
|
|
|
`function TestModule_Factory(t) { return new (t || TestModule)(); }, providers: [{ provide: ` +
|
|
|
|
`Token, useFactory: function (dep) { return new Token(dep); }, deps: [Dep] }], imports: [[OtherModule]] });`);
|
|
|
|
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
|
|
|
expect(dtsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'static ngModuleDef: i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
|
|
|
|
expect(dtsContents).toContain('static ngInjectorDef: i0.\u0275\u0275InjectorDef');
|
2019-01-11 08:50:26 -05:00
|
|
|
});
|
|
|
|
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
it('should compile NgModules with references to local components', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {Foo} from './foo';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Foo],
|
|
|
|
})
|
|
|
|
export class FooModule {}
|
|
|
|
`);
|
2018-09-25 18:35:03 -04:00
|
|
|
env.write('foo.ts', `
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({selector: 'foo', template: ''})
|
|
|
|
export class Foo {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
|
|
|
|
expect(jsContents).toContain('import { Foo } from \'./foo\';');
|
2019-01-24 05:38:58 -05:00
|
|
|
expect(jsContents).not.toMatch(/as i[0-9] from ".\/foo"/);
|
|
|
|
expect(dtsContents).toContain('as i1 from "./foo";');
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile NgModules with references to absolute components', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {Foo} from 'foo';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Foo],
|
|
|
|
})
|
|
|
|
export class FooModule {}
|
|
|
|
`);
|
2019-02-19 20:36:26 -05:00
|
|
|
env.write('node_modules/foo/index.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'foo',
|
|
|
|
template: '',
|
|
|
|
})
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
export class Foo {
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
|
|
|
|
expect(jsContents).toContain('import { Foo } from \'foo\';');
|
2019-01-24 05:38:58 -05:00
|
|
|
expect(jsContents).not.toMatch(/as i[0-9] from "foo"/);
|
|
|
|
expect(dtsContents).toContain('as i1 from "foo";');
|
fix(ivy): force new imports for .d.ts files (#25080)
When ngtsc encounters a reference to a type (for example, a Component
type listed in an NgModule declarations array), it traces the import
of that type and attempts to determine the best way to refer to it.
In the event the type is defined in the same file where a reference
is being generated, the identifier of the type is used. If the type
was imported, ngtsc has a choice. It can use the identifier from the
original import, or it can write a new import to the module where the
type came from.
ngtsc has a bug currently when it elects to rely on the user's import.
When writing a .d.ts file, the user's import may have been elided as
the type was not referred to from the type side of the program. Thus,
in .d.ts files ngtsc must always assume the import may not exist, and
generate a new one.
In .js output the import is guaranteed to still exist, so it's
preferable for ngtsc to continue using the existing import if one is
available.
This commit changes how @angular/compiler writes type definitions, and
allows it to use a different expression to write a type definition than
is used to write the value. This allows ngtsc to specify that types in
type definitions should always be imported. A corresponding change to
the staticallyResolve() Reference system allows the choice of which
type of import to use when generating an Expression from a Reference.
PR Close #25080
2018-07-24 19:10:15 -04:00
|
|
|
});
|
|
|
|
|
2019-03-08 20:57:34 -05:00
|
|
|
it('should compile NgModules with references to forward declared bootstrap components', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, forwardRef, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
bootstrap: [forwardRef(() => Foo)],
|
|
|
|
})
|
|
|
|
export class FooModule {}
|
|
|
|
|
|
|
|
@Component({selector: 'foo', template: 'foo'})
|
|
|
|
export class Foo {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('bootstrap: function () { return [Foo]; }');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile NgModules with references to forward declared directives', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Directive, forwardRef, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [forwardRef(() => Foo)],
|
|
|
|
})
|
|
|
|
export class FooModule {}
|
|
|
|
|
|
|
|
@Directive({selector: 'foo'})
|
|
|
|
export class Foo {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('declarations: function () { return [Foo]; }');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile NgModules with references to forward declared imports', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {forwardRef, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [forwardRef(() => BarModule)],
|
|
|
|
})
|
|
|
|
export class FooModule {}
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class BarModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('imports: function () { return [BarModule]; }');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile NgModules with references to forward declared exports', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {forwardRef, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
exports: [forwardRef(() => BarModule)],
|
|
|
|
})
|
|
|
|
export class FooModule {}
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class BarModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('exports: function () { return [BarModule]; }');
|
|
|
|
});
|
|
|
|
|
2018-06-26 13:44:22 -04:00
|
|
|
it('should compile Pipes without errors', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-06-26 13:44:22 -04:00
|
|
|
import {Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
@Pipe({
|
|
|
|
name: 'test-pipe',
|
|
|
|
pure: false,
|
|
|
|
})
|
|
|
|
export class TestPipe {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-06-26 13:44:22 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2018-06-26 13:44:22 -04:00
|
|
|
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'TestPipe.ngPipeDef = i0.\u0275\u0275definePipe({ name: "test-pipe", type: TestPipe, ' +
|
2018-07-16 19:36:31 -04:00
|
|
|
'factory: function TestPipe_Factory(t) { return new (t || TestPipe)(); }, pure: false })');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(dtsContents)
|
|
|
|
.toContain('static ngPipeDef: i0.\u0275\u0275PipeDefWithMeta<TestPipe, "test-pipe">;');
|
2018-06-26 13:44:22 -04:00
|
|
|
});
|
|
|
|
|
2018-07-03 19:13:54 -04:00
|
|
|
it('should compile pure Pipes without errors', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-07-03 19:13:54 -04:00
|
|
|
import {Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
@Pipe({
|
|
|
|
name: 'test-pipe',
|
|
|
|
})
|
|
|
|
export class TestPipe {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-07-03 19:13:54 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2018-07-03 19:13:54 -04:00
|
|
|
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'TestPipe.ngPipeDef = i0.\u0275\u0275definePipe({ name: "test-pipe", type: TestPipe, ' +
|
2018-07-16 19:36:31 -04:00
|
|
|
'factory: function TestPipe_Factory(t) { return new (t || TestPipe)(); }, pure: true })');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(dtsContents)
|
|
|
|
.toContain('static ngPipeDef: i0.\u0275\u0275PipeDefWithMeta<TestPipe, "test-pipe">;');
|
2018-07-03 19:13:54 -04:00
|
|
|
});
|
|
|
|
|
2018-06-26 13:44:22 -04:00
|
|
|
it('should compile Pipes with dependencies', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-06-26 13:44:22 -04:00
|
|
|
import {Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
export class Dep {}
|
|
|
|
|
|
|
|
@Pipe({
|
|
|
|
name: 'test-pipe',
|
|
|
|
pure: false,
|
|
|
|
})
|
|
|
|
export class TestPipe {
|
|
|
|
constructor(dep: Dep) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-06-26 13:44:22 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents)
|
|
|
|
.toContain('return new (t || TestPipe)(i0.\u0275\u0275directiveInject(Dep));');
|
2018-06-26 13:44:22 -04:00
|
|
|
});
|
|
|
|
|
2019-03-19 16:22:03 -04:00
|
|
|
it('should compile Pipes with generic types', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
@Pipe({
|
|
|
|
name: 'test-pipe',
|
|
|
|
})
|
|
|
|
export class TestPipe<T> {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('TestPipe.ngPipeDef =');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
|
|
|
expect(dtsContents)
|
2019-04-19 12:52:21 -04:00
|
|
|
.toContain('static ngPipeDef: i0.\u0275\u0275PipeDefWithMeta<TestPipe<any>, "test-pipe">;');
|
2019-03-19 16:22:03 -04:00
|
|
|
});
|
|
|
|
|
2018-06-26 13:44:22 -04:00
|
|
|
it('should include @Pipes in @NgModule scopes', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-06-26 13:44:22 -04:00
|
|
|
import {Component, NgModule, Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
@Pipe({name: 'test'})
|
|
|
|
export class TestPipe {}
|
|
|
|
|
|
|
|
@Component({selector: 'test-cmp', template: '{{value | test}}'})
|
|
|
|
export class TestCmp {}
|
|
|
|
|
|
|
|
@NgModule({declarations: [TestPipe, TestCmp]})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-06-26 13:44:22 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
2018-06-26 13:44:22 -04:00
|
|
|
expect(jsContents).toContain('pipes: [TestPipe]');
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
fix(ivy): use 'typeof' and 'never' for type metadata (#24862)
Previously ngtsc would use a tuple of class types for listing metadata
in .d.ts files. For example, an @NgModule's declarations might be
represented with the type:
[NgIf, NgForOf, NgClass]
If the module had no declarations, an empty tuple [] would be produced.
This has two problems.
1. If the class type has generic type parameters, TypeScript will
complain that they're not provided.
2. The empty tuple type is not actually legal.
This commit addresses both problems.
1. Class types are now represented using the `typeof` operator, so the
above declarations would be represented as:
[typeof NgIf, typeof NgForOf, typeof NgClass].
Since typeof operates on a value, it doesn't require generic type
arguments.
2. Instead of an empty tuple, `never` is used to indicate no metadata.
PR Close #24862
2018-07-17 16:34:20 -04:00
|
|
|
expect(dtsContents)
|
2018-09-21 15:12:06 -04:00
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, [typeof TestPipe, typeof TestCmp], never, never>');
|
2018-06-26 13:44:22 -04:00
|
|
|
});
|
2018-07-09 14:36:30 -04:00
|
|
|
|
2019-03-11 20:58:37 -04:00
|
|
|
describe('empty and missing selectors', () => {
|
|
|
|
it('should use default selector for Components when no selector present', () => {
|
|
|
|
env.tsconfig({});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
template: '...',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('selectors: [["ng-component"]]');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should use default selector for Components with empty string selector', () => {
|
|
|
|
env.tsconfig({});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: '',
|
|
|
|
template: '...',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('selectors: [["ng-component"]]');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should throw if selector is missing in Directive decorator params', () => {
|
|
|
|
env.tsconfig({});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Directive} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
inputs: ['a', 'b']
|
|
|
|
})
|
|
|
|
export class TestDir {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(trim(errors[0].messageText as string))
|
|
|
|
.toContain('Directive TestDir has no selector, please add it!');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should throw if Directive selector is an empty string', () => {
|
|
|
|
env.tsconfig({});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Directive} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: ''
|
|
|
|
})
|
|
|
|
export class TestDir {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(trim(errors[0].messageText as string))
|
|
|
|
.toContain('Directive TestDir has no selector, please add it!');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
feat(ivy): support @Injectable on already decorated classes (#28523)
Previously, ngtsc would throw an error if two decorators were matched on
the same class simultaneously. However, @Injectable is a special case, and
it appears frequently on component, directive, and pipe classes. For pipes
in particular, it's a common pattern to treat the pipe class also as an
injectable service.
ngtsc actually lacked the capability to compile multiple matching
decorators on a class, so this commit adds support for that. Decorator
handlers (and thus the decorators they match) are classified into three
categories: PRIMARY, SHARED, and WEAK.
PRIMARY handlers compile decorators that cannot coexist with other primary
decorators. The handlers for Component, Directive, Pipe, and NgModule are
marked as PRIMARY. A class may only have one decorator from this group.
SHARED handlers compile decorators that can coexist with others. Injectable
is the only decorator in this category, meaning it's valid to put an
@Injectable decorator on a previously decorated class.
WEAK handlers behave like SHARED, but are dropped if any non-WEAK handler
matches a class. The handler which compiles ngBaseDef is WEAK, since
ngBaseDef is only needed if a class doesn't otherwise have a decorator.
Tests are added to validate that @Injectable can coexist with the other
decorators and that an error is generated when mixing the primaries.
PR Close #28523
2019-02-01 15:23:21 -05:00
|
|
|
describe('multiple decorators on classes', () => {
|
|
|
|
it('should compile @Injectable on Components, Directives, Pipes, and Modules', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, Directive, Injectable, NgModule, Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({selector: 'test', template: 'test'})
|
|
|
|
@Injectable()
|
|
|
|
export class TestCmp {}
|
|
|
|
|
|
|
|
@Directive({selector: 'test'})
|
|
|
|
@Injectable()
|
|
|
|
export class TestDir {}
|
|
|
|
|
|
|
|
@Pipe({name: 'test'})
|
|
|
|
@Injectable()
|
|
|
|
export class TestPipe {}
|
|
|
|
|
|
|
|
@NgModule({declarations: [TestCmp, TestDir, TestPipe]})
|
|
|
|
@Injectable()
|
|
|
|
export class TestNgModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
|
|
|
|
|
|
|
// Validate that each class has the primary definition.
|
|
|
|
expect(jsContents).toContain('TestCmp.ngComponentDef =');
|
|
|
|
expect(jsContents).toContain('TestDir.ngDirectiveDef =');
|
|
|
|
expect(jsContents).toContain('TestPipe.ngPipeDef =');
|
|
|
|
expect(jsContents).toContain('TestNgModule.ngModuleDef =');
|
|
|
|
|
|
|
|
// Validate that each class also has an injectable definition.
|
|
|
|
expect(jsContents).toContain('TestCmp.ngInjectableDef =');
|
|
|
|
expect(jsContents).toContain('TestDir.ngInjectableDef =');
|
|
|
|
expect(jsContents).toContain('TestPipe.ngInjectableDef =');
|
|
|
|
expect(jsContents).toContain('TestNgModule.ngInjectableDef =');
|
|
|
|
|
|
|
|
// Validate that each class's .d.ts declaration has the primary definition.
|
|
|
|
expect(dtsContents).toContain('ComponentDefWithMeta<TestCmp');
|
|
|
|
expect(dtsContents).toContain('DirectiveDefWithMeta<TestDir');
|
|
|
|
expect(dtsContents).toContain('PipeDefWithMeta<TestPipe');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(dtsContents).toContain('\u0275\u0275NgModuleDefWithMeta<TestNgModule');
|
feat(ivy): support @Injectable on already decorated classes (#28523)
Previously, ngtsc would throw an error if two decorators were matched on
the same class simultaneously. However, @Injectable is a special case, and
it appears frequently on component, directive, and pipe classes. For pipes
in particular, it's a common pattern to treat the pipe class also as an
injectable service.
ngtsc actually lacked the capability to compile multiple matching
decorators on a class, so this commit adds support for that. Decorator
handlers (and thus the decorators they match) are classified into three
categories: PRIMARY, SHARED, and WEAK.
PRIMARY handlers compile decorators that cannot coexist with other primary
decorators. The handlers for Component, Directive, Pipe, and NgModule are
marked as PRIMARY. A class may only have one decorator from this group.
SHARED handlers compile decorators that can coexist with others. Injectable
is the only decorator in this category, meaning it's valid to put an
@Injectable decorator on a previously decorated class.
WEAK handlers behave like SHARED, but are dropped if any non-WEAK handler
matches a class. The handler which compiles ngBaseDef is WEAK, since
ngBaseDef is only needed if a class doesn't otherwise have a decorator.
Tests are added to validate that @Injectable can coexist with the other
decorators and that an error is generated when mixing the primaries.
PR Close #28523
2019-02-01 15:23:21 -05:00
|
|
|
|
|
|
|
// Validate that each class's .d.ts declaration also has an injectable definition.
|
|
|
|
expect(dtsContents).toContain('InjectableDef<TestCmp');
|
|
|
|
expect(dtsContents).toContain('InjectableDef<TestDir');
|
|
|
|
expect(dtsContents).toContain('InjectableDef<TestPipe');
|
|
|
|
expect(dtsContents).toContain('InjectableDef<TestNgModule');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should not compile a component and a directive annotation on the same class', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, Directive} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({selector: 'test', template: 'test'})
|
|
|
|
@Directive({selector: 'test'})
|
|
|
|
class ShouldNotCompile {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(1);
|
|
|
|
expect(errors[0].messageText).toContain('Two incompatible decorators on class');
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
it('should leave decorators present on jit: true directives', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Directive, Inject} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: 'test',
|
|
|
|
jit: true,
|
|
|
|
})
|
|
|
|
export class Test {
|
|
|
|
constructor(@Inject('foo') foo: string) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('Directive({');
|
|
|
|
expect(jsContents).toContain('__param(0, Inject');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
feat(ivy): compile @Injectable on classes not meant for DI (#28523)
In the past, @Injectable had no side effects and existing Angular code is
therefore littered with @Injectable usage on classes which are not intended
to be injected.
A common example is:
@Injectable()
class Foo {
constructor(private notInjectable: string) {}
}
and somewhere else:
providers: [{provide: Foo, useFactory: ...})
Here, there is no need for Foo to be injectable - indeed, it's impossible
for the DI system to create an instance of it, as it has a non-injectable
constructor. The provider configures a factory for the DI system to be
able to create instances of Foo.
Adding @Injectable in Ivy signifies that the class's own constructor, and
not a provider, determines how the class will be created.
This commit adds logic to compile classes which are marked with @Injectable
but are otherwise not injectable, and create an ngInjectableDef field with
a factory function that throws an error. This way, existing code in the wild
continues to compile, but if someone attempts to use the injectable it will
fail with a useful error message.
In the case where strictInjectionParameters is set to true, a compile-time
error is thrown instead of the runtime error, as ngtsc has enough
information to determine when injection couldn't possibly be valid.
PR Close #28523
2019-01-31 17:23:54 -05:00
|
|
|
describe('compiling invalid @Injectables', () => {
|
|
|
|
describe('with strictInjectionParameters = true', () => {
|
|
|
|
it('should give a compile-time error if an invalid @Injectable is used with no arguments',
|
|
|
|
() => {
|
|
|
|
env.tsconfig({strictInjectionParameters: true});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
2019-03-13 14:30:38 -04:00
|
|
|
|
feat(ivy): compile @Injectable on classes not meant for DI (#28523)
In the past, @Injectable had no side effects and existing Angular code is
therefore littered with @Injectable usage on classes which are not intended
to be injected.
A common example is:
@Injectable()
class Foo {
constructor(private notInjectable: string) {}
}
and somewhere else:
providers: [{provide: Foo, useFactory: ...})
Here, there is no need for Foo to be injectable - indeed, it's impossible
for the DI system to create an instance of it, as it has a non-injectable
constructor. The provider configures a factory for the DI system to be
able to create instances of Foo.
Adding @Injectable in Ivy signifies that the class's own constructor, and
not a provider, determines how the class will be created.
This commit adds logic to compile classes which are marked with @Injectable
but are otherwise not injectable, and create an ngInjectableDef field with
a factory function that throws an error. This way, existing code in the wild
continues to compile, but if someone attempts to use the injectable it will
fail with a useful error message.
In the case where strictInjectionParameters is set to true, a compile-time
error is thrown instead of the runtime error, as ngtsc has enough
information to determine when injection couldn't possibly be valid.
PR Close #28523
2019-01-31 17:23:54 -05:00
|
|
|
@Injectable()
|
|
|
|
export class Test {
|
|
|
|
constructor(private notInjectable: string) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(1);
|
|
|
|
expect(errors[0].messageText).toContain('No suitable injection token for parameter');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should give a compile-time error if an invalid @Injectable is used with an argument',
|
|
|
|
() => {
|
|
|
|
env.tsconfig({strictInjectionParameters: true});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
2019-03-13 14:30:38 -04:00
|
|
|
|
feat(ivy): compile @Injectable on classes not meant for DI (#28523)
In the past, @Injectable had no side effects and existing Angular code is
therefore littered with @Injectable usage on classes which are not intended
to be injected.
A common example is:
@Injectable()
class Foo {
constructor(private notInjectable: string) {}
}
and somewhere else:
providers: [{provide: Foo, useFactory: ...})
Here, there is no need for Foo to be injectable - indeed, it's impossible
for the DI system to create an instance of it, as it has a non-injectable
constructor. The provider configures a factory for the DI system to be
able to create instances of Foo.
Adding @Injectable in Ivy signifies that the class's own constructor, and
not a provider, determines how the class will be created.
This commit adds logic to compile classes which are marked with @Injectable
but are otherwise not injectable, and create an ngInjectableDef field with
a factory function that throws an error. This way, existing code in the wild
continues to compile, but if someone attempts to use the injectable it will
fail with a useful error message.
In the case where strictInjectionParameters is set to true, a compile-time
error is thrown instead of the runtime error, as ngtsc has enough
information to determine when injection couldn't possibly be valid.
PR Close #28523
2019-01-31 17:23:54 -05:00
|
|
|
@Injectable()
|
|
|
|
export class Test {
|
|
|
|
constructor(private notInjectable: string) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(1);
|
|
|
|
expect(errors[0].messageText).toContain('No suitable injection token for parameter');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should not give a compile-time error if an invalid @Injectable is used with useValue',
|
|
|
|
() => {
|
|
|
|
env.tsconfig({strictInjectionParameters: true});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
2019-03-13 14:30:38 -04:00
|
|
|
|
feat(ivy): compile @Injectable on classes not meant for DI (#28523)
In the past, @Injectable had no side effects and existing Angular code is
therefore littered with @Injectable usage on classes which are not intended
to be injected.
A common example is:
@Injectable()
class Foo {
constructor(private notInjectable: string) {}
}
and somewhere else:
providers: [{provide: Foo, useFactory: ...})
Here, there is no need for Foo to be injectable - indeed, it's impossible
for the DI system to create an instance of it, as it has a non-injectable
constructor. The provider configures a factory for the DI system to be
able to create instances of Foo.
Adding @Injectable in Ivy signifies that the class's own constructor, and
not a provider, determines how the class will be created.
This commit adds logic to compile classes which are marked with @Injectable
but are otherwise not injectable, and create an ngInjectableDef field with
a factory function that throws an error. This way, existing code in the wild
continues to compile, but if someone attempts to use the injectable it will
fail with a useful error message.
In the case where strictInjectionParameters is set to true, a compile-time
error is thrown instead of the runtime error, as ngtsc has enough
information to determine when injection couldn't possibly be valid.
PR Close #28523
2019-01-31 17:23:54 -05:00
|
|
|
@Injectable({
|
|
|
|
providedIn: 'root',
|
|
|
|
useValue: '42',
|
|
|
|
})
|
|
|
|
export class Test {
|
|
|
|
constructor(private notInjectable: string) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toMatch(/if \(t\).*throw new Error.* else .* '42'/ms);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('with strictInjectionParameters = false', () => {
|
|
|
|
it('should compile an @Injectable on a class with a non-injectable constructor', () => {
|
|
|
|
env.tsconfig({strictInjectionParameters: false});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class Test {
|
|
|
|
constructor(private notInjectable: string) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('factory: function Test_Factory(t) { throw new Error(');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile an @Injectable provided in the root on a class with a non-injectable constructor',
|
|
|
|
() => {
|
|
|
|
env.tsconfig({strictInjectionParameters: false});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
@Injectable({providedIn: 'root'})
|
|
|
|
export class Test {
|
|
|
|
constructor(private notInjectable: string) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('factory: function Test_Factory(t) { throw new Error(');
|
|
|
|
});
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2019-02-17 19:25:45 -05:00
|
|
|
describe('templateUrl and styleUrls processing', () => {
|
|
|
|
const testsForResource = (resource: string) => [
|
|
|
|
// [component location, resource location, resource reference]
|
|
|
|
|
|
|
|
// component and resource are in the same folder
|
|
|
|
[`a/app.ts`, `a/${resource}`, `./${resource}`], //
|
|
|
|
[`a/app.ts`, `a/${resource}`, resource], //
|
|
|
|
[`a/app.ts`, `a/${resource}`, `/a/${resource}`],
|
|
|
|
|
|
|
|
// resource is one level up
|
|
|
|
[`a/app.ts`, resource, `../${resource}`], //
|
|
|
|
[`a/app.ts`, resource, `/${resource}`],
|
|
|
|
|
|
|
|
// component and resource are in different folders
|
|
|
|
[`a/app.ts`, `b/${resource}`, `../b/${resource}`], //
|
|
|
|
[`a/app.ts`, `b/${resource}`, `/b/${resource}`],
|
|
|
|
|
|
|
|
// resource is in subfolder of component directory
|
|
|
|
[`a/app.ts`, `a/b/c/${resource}`, `./b/c/${resource}`], //
|
|
|
|
[`a/app.ts`, `a/b/c/${resource}`, `b/c/${resource}`], //
|
|
|
|
[`a/app.ts`, `a/b/c/${resource}`, `/a/b/c/${resource}`],
|
|
|
|
];
|
|
|
|
|
|
|
|
testsForResource('style.css').forEach((test) => {
|
|
|
|
const [compLoc, styleLoc, styleRef] = test;
|
|
|
|
it(`should handle ${styleRef}`, () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(styleLoc, ':host { background-color: blue; }');
|
|
|
|
env.write(compLoc, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
styleUrls: ['${styleRef}'],
|
|
|
|
template: '...',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents(compLoc.replace('.ts', '.js'));
|
|
|
|
expect(jsContents).toContain('background-color: blue');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
testsForResource('template.html').forEach((test) => {
|
|
|
|
const [compLoc, templateLoc, templateRef] = test;
|
|
|
|
it(`should handle ${templateRef}`, () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(templateLoc, 'Template Content');
|
|
|
|
env.write(compLoc, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
templateUrl: '${templateRef}'
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents(compLoc.replace('.ts', '.js'));
|
|
|
|
expect(jsContents).toContain('Template Content');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2019-01-31 17:19:29 -05:00
|
|
|
describe('former View Engine AST transform bugs', () => {
|
|
|
|
it('should compile array literals behind conditionals', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '{{value ? "yes" : [no]}}',
|
|
|
|
})
|
|
|
|
class TestCmp {
|
|
|
|
value = true;
|
|
|
|
no = 'no';
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(env.getContents('test.js')).toContain('i0.\u0275\u0275pureFunction1');
|
2019-01-31 17:19:29 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile array literals inside function arguments', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '{{fn([test])}}',
|
|
|
|
})
|
|
|
|
class TestCmp {
|
|
|
|
fn(arg: any): string {
|
|
|
|
return 'test';
|
|
|
|
}
|
|
|
|
|
|
|
|
test = 'test';
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(env.getContents('test.js')).toContain('i0.\u0275\u0275pureFunction1');
|
2019-01-31 17:19:29 -05:00
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2018-12-09 09:20:31 -05:00
|
|
|
describe('unwrapping ModuleWithProviders functions', () => {
|
|
|
|
it('should extract the generic type and include it in the module\'s declaration', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
2018-07-09 14:36:30 -04:00
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from 'router';
|
|
|
|
|
|
|
|
@NgModule({imports: [RouterModule.forRoot()]})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
2018-12-09 09:20:31 -05:00
|
|
|
env.write('node_modules/router/index.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2018-07-09 14:36:30 -04:00
|
|
|
|
|
|
|
declare class RouterModule {
|
|
|
|
static forRoot(): ModuleWithProviders<RouterModule>;
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, never, never, never>;
|
2018-07-09 14:36:30 -04:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
2018-12-09 09:20:31 -05:00
|
|
|
env.driveMain();
|
2018-07-10 12:59:29 -04:00
|
|
|
|
2018-12-09 09:20:31 -05:00
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('imports: [[RouterModule.forRoot()]]');
|
2018-07-10 12:59:29 -04:00
|
|
|
|
2018-12-09 09:20:31 -05:00
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2019-01-24 05:38:58 -05:00
|
|
|
expect(dtsContents).toContain(`import * as i1 from "router";`);
|
2018-12-09 09:20:31 -05:00
|
|
|
expect(dtsContents)
|
2019-04-11 16:46:47 -04:00
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
|
2018-12-09 09:20:31 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should extract the generic type if it is provided as qualified type name', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from 'router';
|
|
|
|
|
|
|
|
@NgModule({imports: [RouterModule.forRoot()]})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.write('node_modules/router/index.d.ts', `
|
|
|
|
import {ModuleWithProviders} from '@angular/core';
|
|
|
|
import * as internal from './internal';
|
2018-12-18 14:09:21 -05:00
|
|
|
export {InternalRouterModule} from './internal';
|
2018-12-09 09:20:31 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
declare export class RouterModule {
|
2018-12-09 09:20:31 -05:00
|
|
|
static forRoot(): ModuleWithProviders<internal.InternalRouterModule>;
|
|
|
|
}
|
2018-12-18 14:09:21 -05:00
|
|
|
|
2018-12-09 09:20:31 -05:00
|
|
|
`);
|
|
|
|
|
|
|
|
env.write('node_modules/router/internal.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {\u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2019-02-19 20:36:26 -05:00
|
|
|
export declare class InternalRouterModule {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<InternalRouterModule, never, never, never>;
|
2019-02-19 20:36:26 -05:00
|
|
|
}
|
2018-12-09 09:20:31 -05:00
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('imports: [[RouterModule.forRoot()]]');
|
|
|
|
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2019-01-24 05:38:58 -05:00
|
|
|
expect(dtsContents).toContain(`import * as i1 from "router";`);
|
2018-12-09 09:20:31 -05:00
|
|
|
expect(dtsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, never, [typeof i1.InternalRouterModule], never>');
|
2018-12-09 09:20:31 -05:00
|
|
|
});
|
fix(ivy): don't track identifiers of ffr-resolved references (#29387)
This fix is for a bug in the ngtsc PartialEvaluator, which statically
evaluates expressions.
Sometimes, evaluating a reference requires resolving a function which is
declared in another module, and thus no function body is available. To
support this case, the PartialEvaluator has the concept of a foreign
function resolver.
This allows the interpretation of expressions like:
const router = RouterModule.forRoot([]);
even though the definition of the 'forRoot' function has no body. In
ngtsc today, this will be resolved to a Reference to RouterModule itself,
via the ModuleWithProviders foreign function resolver.
However, the PartialEvaluator also associates any Identifiers in the path
of this resolution with the Reference. This is done so that if the user
writes
const x = imported.y;
'x' can be generated as a local identifier instead of adding an import for
'y'.
This was at the heart of a bug. In the above case with 'router', the
PartialEvaluator added the identifier 'router' to the Reference generated
(through FFR) to RouterModule.
This is not correct. References that result from FFR expressions may not
have the same value at runtime as they do at compile time (indeed, this is
not the case for ModuleWithProviders). The Reference generated via FFR is
"synthetic" in the sense that it's constructed based on a useful
interpretation of the code, not an accurate representation of the runtime
value. Therefore, it may not be legal to refer to the Reference via the
'router' identifier.
This commit adds the ability to mark such a Reference as 'synthetic', which
allows the PartialEvaluator to not add the 'router' identifier down the
line. Tests are included for both the PartialEvaluator itself as well as the
resultant buggy behavior in ngtsc overall.
PR Close #29387
2019-03-18 19:07:36 -04:00
|
|
|
|
|
|
|
it('should not reference a constant with a ModuleWithProviders value in ngModuleDef imports',
|
|
|
|
() => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('dep.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta as \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2018-12-11 08:55:45 -05:00
|
|
|
|
fix(ivy): don't track identifiers of ffr-resolved references (#29387)
This fix is for a bug in the ngtsc PartialEvaluator, which statically
evaluates expressions.
Sometimes, evaluating a reference requires resolving a function which is
declared in another module, and thus no function body is available. To
support this case, the PartialEvaluator has the concept of a foreign
function resolver.
This allows the interpretation of expressions like:
const router = RouterModule.forRoot([]);
even though the definition of the 'forRoot' function has no body. In
ngtsc today, this will be resolved to a Reference to RouterModule itself,
via the ModuleWithProviders foreign function resolver.
However, the PartialEvaluator also associates any Identifiers in the path
of this resolution with the Reference. This is done so that if the user
writes
const x = imported.y;
'x' can be generated as a local identifier instead of adding an import for
'y'.
This was at the heart of a bug. In the above case with 'router', the
PartialEvaluator added the identifier 'router' to the Reference generated
(through FFR) to RouterModule.
This is not correct. References that result from FFR expressions may not
have the same value at runtime as they do at compile time (indeed, this is
not the case for ModuleWithProviders). The Reference generated via FFR is
"synthetic" in the sense that it's constructed based on a useful
interpretation of the code, not an accurate representation of the runtime
value. Therefore, it may not be legal to refer to the Reference via the
'router' identifier.
This commit adds the ability to mark such a Reference as 'synthetic', which
allows the PartialEvaluator to not add the 'router' identifier down the
line. Tests are included for both the PartialEvaluator itself as well as the
resultant buggy behavior in ngtsc overall.
PR Close #29387
2019-03-18 19:07:36 -04:00
|
|
|
export declare class DepModule {
|
|
|
|
static forRoot(arg1: any, arg2: any): ModuleWithProviders<DepModule>;
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<DepModule, never, never, never>;
|
fix(ivy): don't track identifiers of ffr-resolved references (#29387)
This fix is for a bug in the ngtsc PartialEvaluator, which statically
evaluates expressions.
Sometimes, evaluating a reference requires resolving a function which is
declared in another module, and thus no function body is available. To
support this case, the PartialEvaluator has the concept of a foreign
function resolver.
This allows the interpretation of expressions like:
const router = RouterModule.forRoot([]);
even though the definition of the 'forRoot' function has no body. In
ngtsc today, this will be resolved to a Reference to RouterModule itself,
via the ModuleWithProviders foreign function resolver.
However, the PartialEvaluator also associates any Identifiers in the path
of this resolution with the Reference. This is done so that if the user
writes
const x = imported.y;
'x' can be generated as a local identifier instead of adding an import for
'y'.
This was at the heart of a bug. In the above case with 'router', the
PartialEvaluator added the identifier 'router' to the Reference generated
(through FFR) to RouterModule.
This is not correct. References that result from FFR expressions may not
have the same value at runtime as they do at compile time (indeed, this is
not the case for ModuleWithProviders). The Reference generated via FFR is
"synthetic" in the sense that it's constructed based on a useful
interpretation of the code, not an accurate representation of the runtime
value. Therefore, it may not be legal to refer to the Reference via the
'router' identifier.
This commit adds the ability to mark such a Reference as 'synthetic', which
allows the PartialEvaluator to not add the 'router' identifier down the
line. Tests are included for both the PartialEvaluator itself as well as the
resultant buggy behavior in ngtsc overall.
PR Close #29387
2019-03-18 19:07:36 -04:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule, ModuleWithProviders} from '@angular/core';
|
|
|
|
import {DepModule} from './dep';
|
2018-12-11 08:55:45 -05:00
|
|
|
|
fix(ivy): don't track identifiers of ffr-resolved references (#29387)
This fix is for a bug in the ngtsc PartialEvaluator, which statically
evaluates expressions.
Sometimes, evaluating a reference requires resolving a function which is
declared in another module, and thus no function body is available. To
support this case, the PartialEvaluator has the concept of a foreign
function resolver.
This allows the interpretation of expressions like:
const router = RouterModule.forRoot([]);
even though the definition of the 'forRoot' function has no body. In
ngtsc today, this will be resolved to a Reference to RouterModule itself,
via the ModuleWithProviders foreign function resolver.
However, the PartialEvaluator also associates any Identifiers in the path
of this resolution with the Reference. This is done so that if the user
writes
const x = imported.y;
'x' can be generated as a local identifier instead of adding an import for
'y'.
This was at the heart of a bug. In the above case with 'router', the
PartialEvaluator added the identifier 'router' to the Reference generated
(through FFR) to RouterModule.
This is not correct. References that result from FFR expressions may not
have the same value at runtime as they do at compile time (indeed, this is
not the case for ModuleWithProviders). The Reference generated via FFR is
"synthetic" in the sense that it's constructed based on a useful
interpretation of the code, not an accurate representation of the runtime
value. Therefore, it may not be legal to refer to the Reference via the
'router' identifier.
This commit adds the ability to mark such a Reference as 'synthetic', which
allows the PartialEvaluator to not add the 'router' identifier down the
line. Tests are included for both the PartialEvaluator itself as well as the
resultant buggy behavior in ngtsc overall.
PR Close #29387
2019-03-18 19:07:36 -04:00
|
|
|
@NgModule({})
|
|
|
|
export class Base {}
|
2018-12-11 08:55:45 -05:00
|
|
|
|
fix(ivy): don't track identifiers of ffr-resolved references (#29387)
This fix is for a bug in the ngtsc PartialEvaluator, which statically
evaluates expressions.
Sometimes, evaluating a reference requires resolving a function which is
declared in another module, and thus no function body is available. To
support this case, the PartialEvaluator has the concept of a foreign
function resolver.
This allows the interpretation of expressions like:
const router = RouterModule.forRoot([]);
even though the definition of the 'forRoot' function has no body. In
ngtsc today, this will be resolved to a Reference to RouterModule itself,
via the ModuleWithProviders foreign function resolver.
However, the PartialEvaluator also associates any Identifiers in the path
of this resolution with the Reference. This is done so that if the user
writes
const x = imported.y;
'x' can be generated as a local identifier instead of adding an import for
'y'.
This was at the heart of a bug. In the above case with 'router', the
PartialEvaluator added the identifier 'router' to the Reference generated
(through FFR) to RouterModule.
This is not correct. References that result from FFR expressions may not
have the same value at runtime as they do at compile time (indeed, this is
not the case for ModuleWithProviders). The Reference generated via FFR is
"synthetic" in the sense that it's constructed based on a useful
interpretation of the code, not an accurate representation of the runtime
value. Therefore, it may not be legal to refer to the Reference via the
'router' identifier.
This commit adds the ability to mark such a Reference as 'synthetic', which
allows the PartialEvaluator to not add the 'router' identifier down the
line. Tests are included for both the PartialEvaluator itself as well as the
resultant buggy behavior in ngtsc overall.
PR Close #29387
2019-03-18 19:07:36 -04:00
|
|
|
const mwp = DepModule.forRoot(1,2);
|
2018-12-11 08:55:45 -05:00
|
|
|
|
fix(ivy): don't track identifiers of ffr-resolved references (#29387)
This fix is for a bug in the ngtsc PartialEvaluator, which statically
evaluates expressions.
Sometimes, evaluating a reference requires resolving a function which is
declared in another module, and thus no function body is available. To
support this case, the PartialEvaluator has the concept of a foreign
function resolver.
This allows the interpretation of expressions like:
const router = RouterModule.forRoot([]);
even though the definition of the 'forRoot' function has no body. In
ngtsc today, this will be resolved to a Reference to RouterModule itself,
via the ModuleWithProviders foreign function resolver.
However, the PartialEvaluator also associates any Identifiers in the path
of this resolution with the Reference. This is done so that if the user
writes
const x = imported.y;
'x' can be generated as a local identifier instead of adding an import for
'y'.
This was at the heart of a bug. In the above case with 'router', the
PartialEvaluator added the identifier 'router' to the Reference generated
(through FFR) to RouterModule.
This is not correct. References that result from FFR expressions may not
have the same value at runtime as they do at compile time (indeed, this is
not the case for ModuleWithProviders). The Reference generated via FFR is
"synthetic" in the sense that it's constructed based on a useful
interpretation of the code, not an accurate representation of the runtime
value. Therefore, it may not be legal to refer to the Reference via the
'router' identifier.
This commit adds the ability to mark such a Reference as 'synthetic', which
allows the PartialEvaluator to not add the 'router' identifier down the
line. Tests are included for both the PartialEvaluator itself as well as the
resultant buggy behavior in ngtsc overall.
PR Close #29387
2019-03-18 19:07:36 -04:00
|
|
|
@NgModule({
|
|
|
|
imports: [mwp],
|
|
|
|
})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('imports: [i1.DepModule]');
|
|
|
|
});
|
2018-07-09 14:36:30 -04:00
|
|
|
});
|
2018-07-10 12:57:48 -04:00
|
|
|
|
2018-12-11 07:14:21 -05:00
|
|
|
it('should unwrap a ModuleWithProviders-like function if a matching literal type is provided for it',
|
2018-12-11 08:55:45 -05:00
|
|
|
() => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from 'router';
|
|
|
|
|
|
|
|
@NgModule({imports: [RouterModule.forRoot()]})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.write('node_modules/router/index.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2018-12-11 08:55:45 -05:00
|
|
|
|
|
|
|
export interface MyType extends ModuleWithProviders {}
|
|
|
|
|
|
|
|
declare class RouterModule {
|
|
|
|
static forRoot(): (MyType)&{ngModule:RouterModule};
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, never, never, never>;
|
2018-12-11 08:55:45 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('imports: [[RouterModule.forRoot()]]');
|
|
|
|
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
|
|
|
expect(dtsContents).toContain(`import * as i1 from "router";`);
|
|
|
|
expect(dtsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
|
2018-12-11 08:55:45 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should unwrap a namespace imported ModuleWithProviders function if a generic type is provided for it',
|
2018-12-11 07:14:21 -05:00
|
|
|
() => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from 'router';
|
|
|
|
|
|
|
|
@NgModule({imports: [RouterModule.forRoot()]})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.write('node_modules/router/index.d.ts', `
|
2018-12-11 08:55:45 -05:00
|
|
|
import * as core from '@angular/core';
|
|
|
|
import {RouterModule} from 'router';
|
2018-12-11 07:14:21 -05:00
|
|
|
|
|
|
|
declare class RouterModule {
|
2018-12-11 08:55:45 -05:00
|
|
|
static forRoot(): core.ModuleWithProviders<RouterModule>;
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, never, never, never>;
|
2018-12-11 07:14:21 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('imports: [[RouterModule.forRoot()]]');
|
|
|
|
|
|
|
|
const dtsContents = env.getContents('test.d.ts');
|
2019-01-24 05:38:58 -05:00
|
|
|
expect(dtsContents).toContain(`import * as i1 from "router";`);
|
2018-12-11 07:14:21 -05:00
|
|
|
expect(dtsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'i0.\u0275\u0275NgModuleDefWithMeta<TestModule, never, [typeof i1.RouterModule], never>');
|
2018-12-11 07:14:21 -05:00
|
|
|
});
|
|
|
|
|
2018-07-10 12:57:48 -04:00
|
|
|
it('should inject special types according to the metadata', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
2018-07-10 12:57:48 -04:00
|
|
|
import {
|
|
|
|
Attribute,
|
|
|
|
ChangeDetectorRef,
|
|
|
|
Component,
|
|
|
|
ElementRef,
|
|
|
|
Injector,
|
2018-08-16 11:43:29 -04:00
|
|
|
Renderer2,
|
2018-07-10 12:57:48 -04:00
|
|
|
TemplateRef,
|
|
|
|
ViewContainerRef,
|
|
|
|
} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: 'Test',
|
|
|
|
})
|
|
|
|
class FooCmp {
|
|
|
|
constructor(
|
|
|
|
@Attribute("test") attr: string,
|
|
|
|
cdr: ChangeDetectorRef,
|
|
|
|
er: ElementRef,
|
|
|
|
i: Injector,
|
2018-08-16 11:43:29 -04:00
|
|
|
r2: Renderer2,
|
2018-07-10 12:57:48 -04:00
|
|
|
tr: TemplateRef,
|
|
|
|
vcr: ViewContainerRef,
|
|
|
|
) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2018-07-10 12:57:48 -04:00
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
`factory: function FooCmp_Factory(t) { return new (t || FooCmp)(i0.\u0275\u0275injectAttribute("test"), i0.\u0275\u0275directiveInject(i0.ChangeDetectorRef), i0.\u0275\u0275directiveInject(i0.ElementRef), i0.\u0275\u0275directiveInject(i0.Injector), i0.\u0275\u0275directiveInject(i0.Renderer2), i0.\u0275\u0275directiveInject(i0.TemplateRef), i0.\u0275\u0275directiveInject(i0.ViewContainerRef)); }`);
|
2018-07-10 12:57:48 -04:00
|
|
|
});
|
2018-07-18 12:32:36 -04:00
|
|
|
|
|
|
|
it('should generate queries for components', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
2018-07-18 12:32:36 -04:00
|
|
|
import {Component, ContentChild, ContentChildren, TemplateRef, ViewChild} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<div #foo></div>',
|
|
|
|
queries: {
|
|
|
|
'mview': new ViewChild('test1'),
|
|
|
|
'mcontent': new ContentChild('test2'),
|
|
|
|
}
|
|
|
|
})
|
|
|
|
class FooCmp {
|
|
|
|
@ContentChild('bar', {read: TemplateRef}) child: any;
|
|
|
|
@ContentChildren(TemplateRef) children: any;
|
|
|
|
get aview(): any { return null; }
|
|
|
|
@ViewChild('accessor') set aview(value: any) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2018-10-03 16:49:24 -04:00
|
|
|
expect(jsContents).toMatch(varRegExp('bar'));
|
|
|
|
expect(jsContents).toMatch(varRegExp('test1'));
|
|
|
|
expect(jsContents).toMatch(varRegExp('test2'));
|
|
|
|
expect(jsContents).toMatch(varRegExp('accessor'));
|
2019-04-19 12:52:21 -04:00
|
|
|
// match `i0.\u0275\u0275contentQuery(dirIndex, _c1, true, TemplateRef)`
|
2019-01-23 14:54:43 -05:00
|
|
|
expect(jsContents).toMatch(contentQueryRegExp('\\w+', true, 'TemplateRef'));
|
2019-04-19 12:52:21 -04:00
|
|
|
// match `i0.\u0275\u0275viewQuery(_c2, true, null)`
|
2019-01-23 14:54:43 -05:00
|
|
|
expect(jsContents).toMatch(viewQueryRegExp(true));
|
2018-07-18 12:32:36 -04:00
|
|
|
});
|
2018-07-18 12:50:16 -04:00
|
|
|
|
2019-03-13 14:30:38 -04:00
|
|
|
it('should generate queries for directives', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Directive, ContentChild, ContentChildren, TemplateRef, ViewChild} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[test]',
|
|
|
|
queries: {
|
|
|
|
'mview': new ViewChild('test1'),
|
|
|
|
'mcontent': new ContentChild('test2'),
|
|
|
|
}
|
|
|
|
})
|
|
|
|
class FooCmp {
|
|
|
|
@ContentChild('bar', {read: TemplateRef}) child: any;
|
|
|
|
@ContentChildren(TemplateRef) children: any;
|
|
|
|
get aview(): any { return null; }
|
|
|
|
@ViewChild('accessor') set aview(value: any) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toMatch(varRegExp('bar'));
|
|
|
|
expect(jsContents).toMatch(varRegExp('test1'));
|
|
|
|
expect(jsContents).toMatch(varRegExp('test2'));
|
|
|
|
expect(jsContents).toMatch(varRegExp('accessor'));
|
2019-04-19 12:52:21 -04:00
|
|
|
// match `i0.\u0275\u0275contentQuery(dirIndex, _c1, true, TemplateRef)`
|
2019-03-13 14:30:38 -04:00
|
|
|
expect(jsContents).toMatch(contentQueryRegExp('\\w+', true, 'TemplateRef'));
|
|
|
|
|
2019-04-19 12:52:21 -04:00
|
|
|
// match `i0.\u0275\u0275viewQuery(_c2, true, null)`
|
2019-03-13 14:30:38 -04:00
|
|
|
// Note that while ViewQuery doesn't necessarily make sense on a directive, because it doesn't
|
|
|
|
// have a view, we still need to handle it because a component could extend the directive.
|
|
|
|
expect(jsContents).toMatch(viewQueryRegExp(true));
|
|
|
|
});
|
|
|
|
|
2018-07-24 19:05:23 -04:00
|
|
|
it('should handle queries that use forwardRef', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
2018-07-24 19:05:23 -04:00
|
|
|
import {Component, ContentChild, TemplateRef, ViewContainerRef, forwardRef} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<div #foo></div>',
|
|
|
|
})
|
|
|
|
class FooCmp {
|
|
|
|
@ContentChild(forwardRef(() => TemplateRef)) child: any;
|
|
|
|
|
|
|
|
@ContentChild(forwardRef(function() { return ViewContainerRef; })) child2: any;
|
2019-04-13 12:28:27 -04:00
|
|
|
|
|
|
|
@ContentChild((forwardRef((function() { return 'parens'; }) as any))) childInParens: any;
|
2018-07-24 19:05:23 -04:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
// match `i0.\u0275\u0275contentQuery(dirIndex, TemplateRef, true, null)`
|
2019-01-23 14:54:43 -05:00
|
|
|
expect(jsContents).toMatch(contentQueryRegExp('TemplateRef', true));
|
2019-04-19 12:52:21 -04:00
|
|
|
// match `i0.\u0275\u0275contentQuery(dirIndex, ViewContainerRef, true, null)`
|
2019-01-23 14:54:43 -05:00
|
|
|
expect(jsContents).toMatch(contentQueryRegExp('ViewContainerRef', true));
|
2019-04-19 12:52:21 -04:00
|
|
|
// match `i0.\u0275\u0275contentQuery(dirIndex, _c0, true, null)`
|
2019-04-13 12:28:27 -04:00
|
|
|
expect(jsContents).toContain('_c0 = ["parens"];');
|
|
|
|
expect(jsContents).toMatch(contentQueryRegExp('_c0', true));
|
2018-07-24 19:05:23 -04:00
|
|
|
});
|
|
|
|
|
2019-02-01 12:48:17 -05:00
|
|
|
it('should compile expressions that write keys', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, ContentChild, TemplateRef, ViewContainerRef, forwardRef} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<div (click)="test[key] = $event">',
|
|
|
|
})
|
|
|
|
class TestCmp {
|
|
|
|
test: any;
|
|
|
|
key: string;
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
expect(env.getContents('test.js')).toContain('test[key] = $event');
|
|
|
|
});
|
|
|
|
|
2018-11-20 18:20:19 -05:00
|
|
|
it('should generate host listeners for components', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, HostListener} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: 'Test'
|
|
|
|
})
|
|
|
|
class FooCmp {
|
2018-12-19 18:03:47 -05:00
|
|
|
@HostListener('click')
|
|
|
|
onClick(event: any): void {}
|
|
|
|
|
2018-11-20 18:20:19 -05:00
|
|
|
@HostListener('document:click', ['$event.target'])
|
2018-12-19 18:03:47 -05:00
|
|
|
onDocumentClick(eventTarget: HTMLElement): void {}
|
2018-11-20 18:20:19 -05:00
|
|
|
|
|
|
|
@HostListener('window:scroll')
|
2018-12-19 18:03:47 -05:00
|
|
|
onWindowScroll(event: any): void {}
|
2018-11-20 18:20:19 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const hostBindingsFn = `
|
|
|
|
hostBindings: function FooCmp_HostBindings(rf, ctx, elIndex) {
|
|
|
|
if (rf & 1) {
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275listener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick(); });
|
|
|
|
i0.\u0275\u0275listener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onDocumentClick($event.target); }, false, i0.\u0275\u0275resolveDocument);
|
|
|
|
i0.\u0275\u0275listener("scroll", function FooCmp_scroll_HostBindingHandler($event) { return ctx.onWindowScroll(); }, false, i0.\u0275\u0275resolveWindow);
|
2018-11-20 18:20:19 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
`;
|
|
|
|
expect(trim(jsContents)).toContain(trim(hostBindingsFn));
|
|
|
|
});
|
|
|
|
|
2018-12-19 18:03:47 -05:00
|
|
|
it('should throw in case unknown global target is provided', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, HostListener} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: 'Test'
|
|
|
|
})
|
|
|
|
class FooCmp {
|
|
|
|
@HostListener('UnknownTarget:click')
|
|
|
|
onClick(event: any): void {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(trim(errors[0].messageText as string))
|
|
|
|
.toContain(
|
|
|
|
`Unexpected global target 'UnknownTarget' defined for 'click' event. Supported list of global targets: window,document,body.`);
|
|
|
|
});
|
|
|
|
|
2019-01-24 20:25:46 -05:00
|
|
|
it('should throw in case pipes are used in host listeners', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '...',
|
|
|
|
host: {
|
|
|
|
'(click)': 'doSmth() | myPipe'
|
|
|
|
}
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(trim(errors[0].messageText as string))
|
|
|
|
.toContain('Cannot have a pipe in an action expression');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should throw in case pipes are used in host listeners', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '...',
|
|
|
|
host: {
|
|
|
|
'[id]': 'id | myPipe'
|
|
|
|
}
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(trim(errors[0].messageText as string))
|
|
|
|
.toContain('Host binding expression cannot contain pipes');
|
|
|
|
});
|
|
|
|
|
2018-07-18 12:50:16 -04:00
|
|
|
it('should generate host bindings for directives', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
2018-07-18 12:50:16 -04:00
|
|
|
import {Component, HostBinding, HostListener, TemplateRef} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: 'Test',
|
|
|
|
host: {
|
|
|
|
'[attr.hello]': 'foo',
|
|
|
|
'(click)': 'onClick($event)',
|
2018-12-19 18:03:47 -05:00
|
|
|
'(body:click)': 'onBodyClick($event)',
|
2018-07-18 12:50:16 -04:00
|
|
|
'[prop]': 'bar',
|
|
|
|
},
|
|
|
|
})
|
|
|
|
class FooCmp {
|
|
|
|
onClick(event: any): void {}
|
|
|
|
|
|
|
|
@HostBinding('class.someclass')
|
|
|
|
get someClass(): boolean { return false; }
|
|
|
|
|
2018-10-16 13:28:23 -04:00
|
|
|
@HostListener('change', ['arg1', 'arg2', 'arg3'])
|
2018-07-18 12:50:16 -04:00
|
|
|
onChange(event: any, arg: any): void {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2018-11-20 18:20:19 -05:00
|
|
|
const hostBindingsFn = `
|
|
|
|
hostBindings: function FooCmp_HostBindings(rf, ctx, elIndex) {
|
|
|
|
if (rf & 1) {
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275allocHostVars(2);
|
|
|
|
i0.\u0275\u0275listener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onClick($event); });
|
|
|
|
i0.\u0275\u0275listener("click", function FooCmp_click_HostBindingHandler($event) { return ctx.onBodyClick($event); }, false, i0.\u0275\u0275resolveBody);
|
|
|
|
i0.\u0275\u0275listener("change", function FooCmp_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg1, ctx.arg2, ctx.arg3); });
|
|
|
|
i0.\u0275\u0275elementHostStyling(_c0);
|
2018-11-20 18:20:19 -05:00
|
|
|
}
|
|
|
|
if (rf & 2) {
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "hello", i0.\u0275\u0275bind(ctx.foo));
|
2019-04-21 02:35:20 -04:00
|
|
|
i0.\u0275\u0275property("prop", ctx.bar, null, true);
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275elementHostClassProp(0, ctx.someClass);
|
|
|
|
i0.\u0275\u0275elementHostStylingApply();
|
2018-11-20 18:20:19 -05:00
|
|
|
}
|
2018-10-16 13:28:23 -04:00
|
|
|
}
|
|
|
|
`;
|
2018-11-20 18:20:19 -05:00
|
|
|
expect(trim(jsContents)).toContain(trim(hostBindingsFn));
|
2018-10-16 13:28:23 -04:00
|
|
|
});
|
|
|
|
|
2019-02-27 19:54:37 -05:00
|
|
|
it('should accept dynamic host attribute bindings', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('other.d.ts', `
|
|
|
|
export declare const foo: any;
|
|
|
|
`);
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
import {foo} from './other';
|
|
|
|
|
|
|
|
const test = foo.bar();
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '',
|
|
|
|
host: {
|
|
|
|
'test': test,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('i0.\u0275\u0275elementHostAttrs(["test", test])');
|
2019-02-27 19:54:37 -05:00
|
|
|
});
|
|
|
|
|
2019-02-01 16:07:18 -05:00
|
|
|
it('should accept enum values as host bindings', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, HostBinding, HostListener, TemplateRef} from '@angular/core';
|
|
|
|
|
|
|
|
enum HostBindings {
|
|
|
|
Hello = 'foo'
|
|
|
|
}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: 'Test',
|
|
|
|
host: {
|
|
|
|
'[attr.hello]': HostBindings.Hello,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
class FooCmp {
|
|
|
|
foo = 'test';
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(env.getContents('test.js')).toContain('"hello", i0.\u0275\u0275bind(ctx.foo)');
|
2019-02-01 16:07:18 -05:00
|
|
|
});
|
|
|
|
|
2018-11-20 18:20:19 -05:00
|
|
|
it('should generate host listeners for directives within hostBindings section', () => {
|
2018-10-16 13:28:23 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Directive, HostListener} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[test]',
|
|
|
|
})
|
2018-11-20 18:20:19 -05:00
|
|
|
class Dir {
|
2018-10-16 13:28:23 -04:00
|
|
|
@HostListener('change', ['arg'])
|
|
|
|
onChange(event: any, arg: any): void {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2018-11-20 18:20:19 -05:00
|
|
|
const hostBindingsFn = `
|
|
|
|
hostBindings: function Dir_HostBindings(rf, ctx, elIndex) {
|
|
|
|
if (rf & 1) {
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275listener("change", function Dir_change_HostBindingHandler($event) { return ctx.onChange(ctx.arg); });
|
2018-11-20 18:20:19 -05:00
|
|
|
}
|
2018-10-16 13:28:23 -04:00
|
|
|
}
|
|
|
|
`;
|
2018-11-20 18:20:19 -05:00
|
|
|
expect(trim(jsContents)).toContain(trim(hostBindingsFn));
|
2018-07-18 12:50:16 -04:00
|
|
|
});
|
2018-07-25 14:16:00 -04:00
|
|
|
|
2018-11-16 12:57:23 -05:00
|
|
|
it('should use proper default value for preserveWhitespaces config param', () => {
|
|
|
|
env.tsconfig(); // default is `false`
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
preserveWhitespaces: false,
|
|
|
|
template: \`
|
|
|
|
<div>
|
|
|
|
Template with whitespaces
|
|
|
|
</div>
|
|
|
|
\`
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('text(1, " Template with whitespaces ");');
|
|
|
|
});
|
|
|
|
|
2018-11-20 13:51:16 -05:00
|
|
|
it('should take preserveWhitespaces config option into account', () => {
|
|
|
|
env.tsconfig({preserveWhitespaces: true});
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: \`
|
|
|
|
<div>
|
|
|
|
Template with whitespaces
|
|
|
|
</div>
|
|
|
|
\`
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain('text(2, "\\n Template with whitespaces\\n ");');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('@Component\'s preserveWhitespaces should override the one defined in config', () => {
|
|
|
|
env.tsconfig({preserveWhitespaces: true});
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
preserveWhitespaces: false,
|
|
|
|
template: \`
|
|
|
|
<div>
|
|
|
|
Template with whitespaces
|
|
|
|
</div>
|
|
|
|
\`
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('text(1, " Template with whitespaces ");');
|
|
|
|
});
|
|
|
|
|
2018-11-16 12:57:23 -05:00
|
|
|
it('should use proper default value for i18nUseExternalIds config param', () => {
|
|
|
|
env.tsconfig(); // default is `true`
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<div i18n>Some text</div>'
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-11 05:17:49 -04:00
|
|
|
expect(jsContents).toContain('MSG_EXTERNAL_8321000940098097247$$TEST_TS_1');
|
2018-11-16 12:57:23 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should take i18nUseExternalIds config option into account', () => {
|
|
|
|
env.tsconfig({i18nUseExternalIds: false});
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<div i18n>Some text</div>'
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-11 05:17:49 -04:00
|
|
|
expect(jsContents).not.toContain('MSG_EXTERNAL_');
|
2018-11-16 12:57:23 -05:00
|
|
|
});
|
|
|
|
|
2018-11-29 19:21:16 -05:00
|
|
|
it('@Component\'s `interpolation` should override default interpolation config', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'cmp-with-custom-interpolation-a',
|
|
|
|
template: \`<div>{%text%}</div>\`,
|
|
|
|
interpolation: ['{%', '%}']
|
|
|
|
})
|
|
|
|
class ComponentWithCustomInterpolationA {
|
|
|
|
text = 'Custom Interpolation A';
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('interpolation1("", ctx.text, "")');
|
|
|
|
});
|
|
|
|
|
2019-01-07 19:35:06 -05:00
|
|
|
it('should handle `encapsulation` field', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, ViewEncapsulation} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'comp-a',
|
|
|
|
template: '...',
|
|
|
|
encapsulation: ViewEncapsulation.None
|
|
|
|
})
|
|
|
|
class CompA {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('encapsulation: 2');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should throw if `encapsulation` contains invalid value', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'comp-a',
|
|
|
|
template: '...',
|
|
|
|
encapsulation: 'invalid-value'
|
|
|
|
})
|
|
|
|
class CompA {}
|
|
|
|
`);
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors[0].messageText)
|
|
|
|
.toContain('encapsulation must be a member of ViewEncapsulation enum from @angular/core');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should handle `changeDetection` field', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, ChangeDetectionStrategy} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'comp-a',
|
|
|
|
template: '...',
|
|
|
|
changeDetection: ChangeDetectionStrategy.OnPush
|
|
|
|
})
|
|
|
|
class CompA {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('changeDetection: 0');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should throw if `changeDetection` contains invalid value', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'comp-a',
|
|
|
|
template: '...',
|
|
|
|
changeDetection: 'invalid-value'
|
|
|
|
})
|
|
|
|
class CompA {}
|
|
|
|
`);
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors[0].messageText)
|
|
|
|
.toContain(
|
|
|
|
'changeDetection must be a member of ChangeDetectionStrategy enum from @angular/core');
|
|
|
|
});
|
|
|
|
|
2019-01-10 18:54:48 -05:00
|
|
|
it('should ignore empty bindings', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<div [someProp]></div>'
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).not.toContain('i0.\u0275\u0275elementProperty');
|
2019-01-10 18:54:48 -05:00
|
|
|
});
|
|
|
|
|
2018-07-25 14:16:00 -04:00
|
|
|
it('should correctly recognize local symbols', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('module.ts', `
|
2018-07-25 14:16:00 -04:00
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {Dir, Comp} from './test';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Dir, Comp],
|
|
|
|
exports: [Dir, Comp],
|
|
|
|
})
|
|
|
|
class Module {}
|
|
|
|
`);
|
2018-09-25 18:35:03 -04:00
|
|
|
env.write(`test.ts`, `
|
2018-07-25 14:16:00 -04:00
|
|
|
import {Component, Directive} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[dir]',
|
|
|
|
})
|
|
|
|
export class Dir {}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<div dir>Test</div>',
|
|
|
|
})
|
|
|
|
export class Comp {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2018-07-25 14:16:00 -04:00
|
|
|
expect(jsContents).not.toMatch(/import \* as i[0-9] from ['"].\/test['"]/);
|
|
|
|
});
|
2018-07-28 01:57:44 -04:00
|
|
|
|
2018-08-06 03:56:43 -04:00
|
|
|
it('should generate exportAs declarations', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-08-06 03:56:43 -04:00
|
|
|
import {Component, Directive} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[test]',
|
|
|
|
exportAs: 'foo',
|
|
|
|
})
|
|
|
|
class Dir {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-08-06 03:56:43 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
2019-01-10 16:24:32 -05:00
|
|
|
expect(jsContents).toContain(`exportAs: ["foo"]`);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should generate multiple exportAs declarations', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, Directive} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[test]',
|
|
|
|
exportAs: 'foo, bar',
|
|
|
|
})
|
|
|
|
class Dir {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain(`exportAs: ["foo", "bar"]`);
|
2018-08-06 03:56:43 -04:00
|
|
|
});
|
|
|
|
|
2018-07-28 01:57:44 -04:00
|
|
|
it('should generate correct factory stubs for a test module', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig({'allowEmptyCodegenFiles': true});
|
2018-07-28 01:57:44 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.write('test.ts', `
|
2018-07-28 01:57:44 -04:00
|
|
|
import {Injectable, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class NotAModule {}
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.write('empty.ts', `
|
2018-07-28 01:57:44 -04:00
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class NotAModule {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-07-28 01:57:44 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const factoryContents = env.getContents('test.ngfactory.js');
|
2018-07-28 01:57:44 -04:00
|
|
|
expect(factoryContents).toContain(`import * as i0 from '@angular/core';`);
|
|
|
|
expect(factoryContents).toContain(`import { NotAModule, TestModule } from './test';`);
|
|
|
|
expect(factoryContents)
|
2019-04-19 12:52:21 -04:00
|
|
|
.toContain(`export var TestModuleNgFactory = new i0.\u0275NgModuleFactory(TestModule);`);
|
2018-07-28 01:57:44 -04:00
|
|
|
expect(factoryContents).not.toContain(`NotAModuleNgFactory`);
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(factoryContents).not.toContain('\u0275NonEmptyModule');
|
2018-07-28 01:57:44 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const emptyFactory = env.getContents('empty.ngfactory.js');
|
2018-07-28 01:57:44 -04:00
|
|
|
expect(emptyFactory).toContain(`import * as i0 from '@angular/core';`);
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(emptyFactory).toContain(`export var \u0275NonEmptyModule = true;`);
|
2018-07-28 01:57:44 -04:00
|
|
|
});
|
2018-08-06 05:48:26 -04:00
|
|
|
|
2019-03-01 18:17:26 -05:00
|
|
|
it('should copy a top-level comment into a factory stub', () => {
|
|
|
|
env.tsconfig({'allowEmptyCodegenFiles': true});
|
|
|
|
|
|
|
|
env.write('test.ts', `/** I am a top-level comment. */
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const factoryContents = env.getContents('test.ngfactory.js');
|
|
|
|
expect(factoryContents).toMatch(/^\/\*\* I am a top-level comment\. \*\//);
|
|
|
|
});
|
|
|
|
|
2019-02-19 11:50:27 -05:00
|
|
|
it('should be able to compile an app using the factory shim', () => {
|
|
|
|
env.tsconfig({'allowEmptyCodegenFiles': true});
|
|
|
|
|
2019-03-13 14:30:38 -04:00
|
|
|
env.write('test.ts', `
|
2019-02-19 11:50:27 -05:00
|
|
|
export {MyModuleNgFactory} from './my-module.ngfactory';
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.write('my-module.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class MyModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
});
|
|
|
|
|
2019-01-08 16:02:11 -05:00
|
|
|
it('should generate correct imports in factory stubs when compiling @angular/core', () => {
|
|
|
|
env.tsconfig({'allowEmptyCodegenFiles': true});
|
|
|
|
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
// Trick the compiler into thinking it's compiling @angular/core.
|
|
|
|
env.write('r3_symbols.ts', 'export const ITS_JUST_ANGULAR = true;');
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const factoryContents = env.getContents('test.ngfactory.js');
|
|
|
|
expect(normalize(factoryContents)).toBe(normalize(`
|
|
|
|
import * as i0 from "./r3_symbols";
|
|
|
|
import { TestModule } from './test';
|
|
|
|
export var TestModuleNgFactory = new i0.NgModuleFactory(TestModule);
|
|
|
|
`));
|
|
|
|
});
|
|
|
|
|
2018-10-16 18:07:46 -04:00
|
|
|
it('should generate a summary stub for decorated classes in the input file only', () => {
|
|
|
|
env.tsconfig({'allowEmptyCodegenFiles': true});
|
|
|
|
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
export class NotAModule {}
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const summaryContents = env.getContents('test.ngsummary.js');
|
|
|
|
expect(summaryContents).toEqual(`export var TestModuleNgSummary = null;\n`);
|
|
|
|
});
|
|
|
|
|
2019-03-08 16:18:32 -05:00
|
|
|
it('should generate a summary stub for classes exported via exports', () => {
|
|
|
|
env.tsconfig({'allowEmptyCodegenFiles': true});
|
|
|
|
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Injectable, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
class NotDirectlyExported {}
|
|
|
|
|
|
|
|
export {NotDirectlyExported};
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const summaryContents = env.getContents('test.ngsummary.js');
|
|
|
|
expect(summaryContents).toEqual(`export var NotDirectlyExportedNgSummary = null;\n`);
|
|
|
|
});
|
|
|
|
|
2018-10-16 18:07:46 -04:00
|
|
|
it('it should generate empty export when there are no other summary symbols, to ensure the output is a valid ES module',
|
|
|
|
() => {
|
|
|
|
env.tsconfig({'allowEmptyCodegenFiles': true});
|
|
|
|
env.write('empty.ts', `
|
|
|
|
export class NotAModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const emptySummary = env.getContents('empty.ngsummary.js');
|
|
|
|
// The empty export ensures this js file is still an ES module.
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(emptySummary).toEqual(`export var \u0275empty = null;\n`);
|
2018-10-16 18:07:46 -04:00
|
|
|
});
|
|
|
|
|
2018-08-06 05:48:26 -04:00
|
|
|
it('should compile a banana-in-a-box inside of a template', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-08-06 05:48:26 -04:00
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
template: '<div *tmpl [(bananaInABox)]="prop"></div>',
|
|
|
|
selector: 'test'
|
|
|
|
})
|
|
|
|
class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-08-06 05:48:26 -04:00
|
|
|
});
|
2018-07-16 19:36:31 -04:00
|
|
|
|
|
|
|
it('generates inherited factory definitions', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
2018-07-16 19:36:31 -04:00
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
class Dep {}
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
class Base {
|
|
|
|
constructor(dep: Dep) {}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
class Child extends Base {}
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
class GrandChild extends Child {
|
|
|
|
constructor() {
|
|
|
|
super(null!);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2018-07-16 19:36:31 -04:00
|
|
|
|
|
|
|
expect(jsContents)
|
2019-04-19 12:52:21 -04:00
|
|
|
.toContain(
|
|
|
|
'function Base_Factory(t) { return new (t || Base)(i0.\u0275\u0275inject(Dep)); }');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain('var \u0275Child_BaseFactory = i0.\u0275\u0275getInheritedFactory(Child)');
|
2018-07-16 19:36:31 -04:00
|
|
|
expect(jsContents)
|
2019-04-19 12:52:21 -04:00
|
|
|
.toContain('function Child_Factory(t) { return \u0275Child_BaseFactory((t || Child)); }');
|
2018-07-16 19:36:31 -04:00
|
|
|
expect(jsContents)
|
|
|
|
.toContain('function GrandChild_Factory(t) { return new (t || GrandChild)(); }');
|
|
|
|
});
|
2018-08-06 08:49:35 -04:00
|
|
|
|
2018-08-22 14:37:07 -04:00
|
|
|
it('generates base factories for directives', () => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
2018-08-22 14:37:07 -04:00
|
|
|
import {Directive} from '@angular/core';
|
|
|
|
|
|
|
|
class Base {}
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[test]',
|
|
|
|
})
|
|
|
|
class Dir extends Base {
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2018-08-22 14:37:07 -04:00
|
|
|
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents)
|
|
|
|
.toContain('var \u0275Dir_BaseFactory = i0.\u0275\u0275getInheritedFactory(Dir)');
|
2018-08-22 14:37:07 -04:00
|
|
|
});
|
|
|
|
|
2018-08-06 08:49:35 -04:00
|
|
|
it('should wrap "directives" in component metadata in a closure when forward references are present',
|
|
|
|
() => {
|
2018-09-25 18:35:03 -04:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
2018-08-06 08:49:35 -04:00
|
|
|
import {Component, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'cmp-a',
|
|
|
|
template: '<cmp-b></cmp-b>',
|
|
|
|
})
|
|
|
|
class CmpA {}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'cmp-b',
|
|
|
|
template: 'This is B',
|
|
|
|
})
|
|
|
|
class CmpB {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [CmpA, CmpB],
|
|
|
|
})
|
|
|
|
class Module {}
|
|
|
|
`);
|
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
env.driveMain();
|
2018-08-06 08:49:35 -04:00
|
|
|
|
2018-09-25 18:35:03 -04:00
|
|
|
const jsContents = env.getContents('test.js');
|
2018-08-06 08:49:35 -04:00
|
|
|
expect(jsContents).toContain('directives: function () { return [CmpB]; }');
|
|
|
|
});
|
2018-10-30 14:19:10 -04:00
|
|
|
|
|
|
|
it('should emit setClassMetadata calls for all types', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, Directive, Injectable, NgModule, Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({selector: 'cmp', template: 'I am a component!'}) class TestComponent {}
|
|
|
|
@Directive({selector: 'dir'}) class TestDirective {}
|
|
|
|
@Injectable() class TestInjectable {}
|
|
|
|
@NgModule({declarations: [TestComponent, TestDirective]}) class TestNgModule {}
|
|
|
|
@Pipe({name: 'pipe'}) class TestPipe {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('\u0275setClassMetadata(TestComponent, ');
|
|
|
|
expect(jsContents).toContain('\u0275setClassMetadata(TestDirective, ');
|
|
|
|
expect(jsContents).toContain('\u0275setClassMetadata(TestInjectable, ');
|
|
|
|
expect(jsContents).toContain('\u0275setClassMetadata(TestNgModule, ');
|
|
|
|
expect(jsContents).toContain('\u0275setClassMetadata(TestPipe, ');
|
2018-10-30 14:19:10 -04:00
|
|
|
});
|
2018-11-20 11:20:16 -05:00
|
|
|
|
2019-02-22 21:06:25 -05:00
|
|
|
it('should use imported types in setClassMetadata if they can be represented as values', () => {
|
|
|
|
env.tsconfig({});
|
|
|
|
|
|
|
|
env.write(`types.ts`, `
|
|
|
|
export class MyTypeA {}
|
|
|
|
export class MyTypeB {}
|
|
|
|
`);
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, Inject, Injectable} from '@angular/core';
|
|
|
|
import {MyTypeA, MyTypeB} from './types';
|
|
|
|
|
|
|
|
@Injectable({providedIn: 'root'})
|
|
|
|
export class SomeService {
|
|
|
|
constructor(arg: MyTypeA) {}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'some-comp',
|
|
|
|
template: '...',
|
|
|
|
})
|
|
|
|
export class SomeComp {
|
|
|
|
constructor(@Inject('arg-token') arg: MyTypeB) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = trim(env.getContents('test.js'));
|
2019-03-04 14:43:55 -05:00
|
|
|
expect(jsContents).toContain(`import * as i1 from "./types";`);
|
|
|
|
expect(jsContents).toMatch(setClassMetadataRegExp('type: i1\\.MyTypeA'));
|
|
|
|
expect(jsContents).toMatch(setClassMetadataRegExp('type: i1\\.MyTypeB'));
|
2019-02-22 21:06:25 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should use imported types in setClassMetadata if they can be represented as values and imported as `* as foo`',
|
|
|
|
() => {
|
|
|
|
env.tsconfig({});
|
|
|
|
|
|
|
|
env.write(`types.ts`, `
|
|
|
|
export class MyTypeA {}
|
|
|
|
export class MyTypeB {}
|
|
|
|
`);
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, Inject, Injectable} from '@angular/core';
|
|
|
|
import * as types from './types';
|
|
|
|
|
|
|
|
@Injectable({providedIn: 'root'})
|
|
|
|
export class SomeService {
|
|
|
|
constructor(arg: types.MyTypeA) {}
|
|
|
|
}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'some-comp',
|
|
|
|
template: '...',
|
|
|
|
})
|
|
|
|
export class SomeComp {
|
|
|
|
constructor(@Inject('arg-token') arg: types.MyTypeB) {}
|
|
|
|
}
|
2019-03-04 14:43:55 -05:00
|
|
|
`);
|
2019-02-22 21:06:25 -05:00
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = trim(env.getContents('test.js'));
|
fix(ivy): reuse default imports in type-to-value references (#29266)
This fixes an issue with commit b6f6b117. In this commit, default imports
processed in a type-to-value conversion were recorded as non-local imports
with a '*' name, and the ImportManager generated a new default import for
them. When transpiled to ES2015 modules, this resulted in the following
correct code:
import i3 from './module';
// somewhere in the file, a value reference of i3:
{type: i3}
However, when the AST with this synthetic import and reference was
transpiled to non-ES2015 modules (for example, to commonjs) an issue
appeared:
var module_1 = require('./module');
{type: i3}
TypeScript renames the imported identifier from i3 to module_1, but doesn't
substitute later references to i3. This is because the import and reference
are both synthetic, and never went through the TypeScript AST step of
"binding" which associates the reference to its import. This association is
important during emit when the identifiers might change.
Synthetic (transformer-added) imports will never be bound properly. The only
possible solution is to reuse the user's original import and the identifier
from it, which will be properly downleveled. The issue with this approach
(which prompted the fix in b6f6b117) is that if the import is only used in a
type position, TypeScript will mark it for deletion in the generated JS,
even though additional non-type usages are added in the transformer. This
again would leave a dangling import.
To work around this, it's necessary for the compiler to keep track of
identifiers that it emits which came from default imports, and tell TS not
to remove those imports during transpilation. A `DefaultImportTracker` class
is implemented to perform this tracking. It implements a
`DefaultImportRecorder` interface, which is used to record two significant
pieces of information:
* when a WrappedNodeExpr is generated which refers to a default imported
value, the ts.Identifier is associated to the ts.ImportDeclaration via
the recorder.
* when that WrappedNodeExpr is later emitted as part of the statement /
expression translators, the fact that the ts.Identifier was used is
also recorded.
Combined, this tracking gives the `DefaultImportTracker` enough information
to implement another TS transformer, which can recognize default imports
which were used in the output of the Ivy transform and can prevent them
from being elided. This is done by creating a new ts.ImportDeclaration for
the imports with the same ts.ImportClause. A test verifies that this works.
PR Close #29266
2019-03-11 19:54:07 -04:00
|
|
|
expect(jsContents).toContain(`import * as i1 from "./types";`);
|
|
|
|
expect(jsContents).toMatch(setClassMetadataRegExp('type: i1.MyTypeA'));
|
|
|
|
expect(jsContents).toMatch(setClassMetadataRegExp('type: i1.MyTypeB'));
|
2019-02-22 21:06:25 -05:00
|
|
|
});
|
|
|
|
|
2019-03-06 19:35:08 -05:00
|
|
|
it('should use default-imported types if they can be represented as values', () => {
|
|
|
|
env.tsconfig({});
|
|
|
|
|
|
|
|
env.write(`types.ts`, `
|
|
|
|
export default class Default {}
|
|
|
|
export class Other {}
|
|
|
|
`);
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
import {Other} from './types';
|
|
|
|
import Default from './types';
|
2019-03-13 14:30:38 -04:00
|
|
|
|
2019-03-06 19:35:08 -05:00
|
|
|
@Component({selector: 'test', template: 'test'})
|
|
|
|
export class SomeCmp {
|
|
|
|
constructor(arg: Default, other: Other) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = trim(env.getContents('test.js'));
|
fix(ivy): reuse default imports in type-to-value references (#29266)
This fixes an issue with commit b6f6b117. In this commit, default imports
processed in a type-to-value conversion were recorded as non-local imports
with a '*' name, and the ImportManager generated a new default import for
them. When transpiled to ES2015 modules, this resulted in the following
correct code:
import i3 from './module';
// somewhere in the file, a value reference of i3:
{type: i3}
However, when the AST with this synthetic import and reference was
transpiled to non-ES2015 modules (for example, to commonjs) an issue
appeared:
var module_1 = require('./module');
{type: i3}
TypeScript renames the imported identifier from i3 to module_1, but doesn't
substitute later references to i3. This is because the import and reference
are both synthetic, and never went through the TypeScript AST step of
"binding" which associates the reference to its import. This association is
important during emit when the identifiers might change.
Synthetic (transformer-added) imports will never be bound properly. The only
possible solution is to reuse the user's original import and the identifier
from it, which will be properly downleveled. The issue with this approach
(which prompted the fix in b6f6b117) is that if the import is only used in a
type position, TypeScript will mark it for deletion in the generated JS,
even though additional non-type usages are added in the transformer. This
again would leave a dangling import.
To work around this, it's necessary for the compiler to keep track of
identifiers that it emits which came from default imports, and tell TS not
to remove those imports during transpilation. A `DefaultImportTracker` class
is implemented to perform this tracking. It implements a
`DefaultImportRecorder` interface, which is used to record two significant
pieces of information:
* when a WrappedNodeExpr is generated which refers to a default imported
value, the ts.Identifier is associated to the ts.ImportDeclaration via
the recorder.
* when that WrappedNodeExpr is later emitted as part of the statement /
expression translators, the fact that the ts.Identifier was used is
also recorded.
Combined, this tracking gives the `DefaultImportTracker` enough information
to implement another TS transformer, which can recognize default imports
which were used in the output of the Ivy transform and can prevent them
from being elided. This is done by creating a new ts.ImportDeclaration for
the imports with the same ts.ImportClause. A test verifies that this works.
PR Close #29266
2019-03-11 19:54:07 -04:00
|
|
|
expect(jsContents).toContain(`import Default from './types';`);
|
|
|
|
expect(jsContents).toContain(`import * as i1 from "./types";`);
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('i0.\u0275\u0275directiveInject(Default)');
|
|
|
|
expect(jsContents).toContain('i0.\u0275\u0275directiveInject(i1.Other)');
|
fix(ivy): reuse default imports in type-to-value references (#29266)
This fixes an issue with commit b6f6b117. In this commit, default imports
processed in a type-to-value conversion were recorded as non-local imports
with a '*' name, and the ImportManager generated a new default import for
them. When transpiled to ES2015 modules, this resulted in the following
correct code:
import i3 from './module';
// somewhere in the file, a value reference of i3:
{type: i3}
However, when the AST with this synthetic import and reference was
transpiled to non-ES2015 modules (for example, to commonjs) an issue
appeared:
var module_1 = require('./module');
{type: i3}
TypeScript renames the imported identifier from i3 to module_1, but doesn't
substitute later references to i3. This is because the import and reference
are both synthetic, and never went through the TypeScript AST step of
"binding" which associates the reference to its import. This association is
important during emit when the identifiers might change.
Synthetic (transformer-added) imports will never be bound properly. The only
possible solution is to reuse the user's original import and the identifier
from it, which will be properly downleveled. The issue with this approach
(which prompted the fix in b6f6b117) is that if the import is only used in a
type position, TypeScript will mark it for deletion in the generated JS,
even though additional non-type usages are added in the transformer. This
again would leave a dangling import.
To work around this, it's necessary for the compiler to keep track of
identifiers that it emits which came from default imports, and tell TS not
to remove those imports during transpilation. A `DefaultImportTracker` class
is implemented to perform this tracking. It implements a
`DefaultImportRecorder` interface, which is used to record two significant
pieces of information:
* when a WrappedNodeExpr is generated which refers to a default imported
value, the ts.Identifier is associated to the ts.ImportDeclaration via
the recorder.
* when that WrappedNodeExpr is later emitted as part of the statement /
expression translators, the fact that the ts.Identifier was used is
also recorded.
Combined, this tracking gives the `DefaultImportTracker` enough information
to implement another TS transformer, which can recognize default imports
which were used in the output of the Ivy transform and can prevent them
from being elided. This is done by creating a new ts.ImportDeclaration for
the imports with the same ts.ImportClause. A test verifies that this works.
PR Close #29266
2019-03-11 19:54:07 -04:00
|
|
|
expect(jsContents).toMatch(setClassMetadataRegExp('type: Default'));
|
|
|
|
expect(jsContents).toMatch(setClassMetadataRegExp('type: i1.Other'));
|
2019-03-06 19:35:08 -05:00
|
|
|
});
|
|
|
|
|
2019-02-22 21:06:25 -05:00
|
|
|
it('should use `undefined` in setClassMetadata if types can\'t be represented as values', () => {
|
|
|
|
env.tsconfig({});
|
|
|
|
|
|
|
|
env.write(`types.ts`, `
|
|
|
|
export type MyType = Map<any, any>;
|
|
|
|
`);
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, Inject, Injectable} from '@angular/core';
|
|
|
|
import {MyType} from './types';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'some-comp',
|
|
|
|
template: '...',
|
|
|
|
})
|
|
|
|
export class SomeComp {
|
|
|
|
constructor(@Inject('arg-token') arg: MyType) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = trim(env.getContents('test.js'));
|
|
|
|
expect(jsContents).not.toContain(`import { MyType } from './types';`);
|
|
|
|
// Note: `type: undefined` below, since MyType can't be represented as a value
|
|
|
|
expect(jsContents).toMatch(setClassMetadataRegExp('type: undefined'));
|
|
|
|
});
|
|
|
|
|
2019-02-19 21:28:00 -05:00
|
|
|
it('should not throw in case whitespaces and HTML comments are present inside <ng-content>',
|
|
|
|
() => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'cmp-a',
|
|
|
|
template: \`
|
|
|
|
<ng-content>
|
|
|
|
<!-- Some comments -->
|
|
|
|
</ng-content>
|
|
|
|
\`,
|
|
|
|
})
|
|
|
|
class CmpA {}
|
|
|
|
`);
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(0);
|
|
|
|
});
|
|
|
|
|
2018-11-20 11:20:16 -05:00
|
|
|
it('should compile a template using multiple directives with the same selector', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, Directive, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({selector: '[test]'})
|
|
|
|
class DirA {}
|
|
|
|
|
|
|
|
@Directive({selector: '[test]'})
|
|
|
|
class DirB {}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
template: '<div test></div>',
|
|
|
|
})
|
|
|
|
class Cmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Cmp, DirA, DirB],
|
|
|
|
})
|
|
|
|
class Module {}
|
feat(ivy): detect cycles and use remote scoping of components if needed (#28169)
By its nature, Ivy alters the import graph of a TS program, adding imports
where template dependencies exist. For example, if ComponentA uses PipeB
in its template, Ivy will insert an import of PipeB into the file in which
ComponentA is declared.
Any insertion of an import into a program has the potential to introduce a
cycle into the import graph. If for some reason the file in which PipeB is
declared imports the file in which ComponentA is declared (maybe it makes
use of a service or utility function that happens to be in the same file as
ComponentA) then this could create an import cycle. This turns out to
happen quite regularly in larger Angular codebases.
TypeScript and the Ivy runtime have no issues with such cycles. However,
other tools are not so accepting. In particular the Closure Compiler is
very anti-cycle.
To mitigate this problem, it's necessary to detect when the insertion of
an import would create a cycle. ngtsc can then use a different strategy,
known as "remote scoping", instead of directly writing a reference from
one component to another. Under remote scoping, a function
'setComponentScope' is called after the declaration of the component's
module, which does not require the addition of new imports.
FW-647 #resolve
PR Close #28169
2019-01-15 15:32:10 -05:00
|
|
|
`);
|
2018-11-20 11:20:16 -05:00
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toMatch(/directives: \[DirA,\s+DirB\]/);
|
|
|
|
});
|
2018-12-03 20:13:23 -05:00
|
|
|
|
feat(ivy): detect cycles and use remote scoping of components if needed (#28169)
By its nature, Ivy alters the import graph of a TS program, adding imports
where template dependencies exist. For example, if ComponentA uses PipeB
in its template, Ivy will insert an import of PipeB into the file in which
ComponentA is declared.
Any insertion of an import into a program has the potential to introduce a
cycle into the import graph. If for some reason the file in which PipeB is
declared imports the file in which ComponentA is declared (maybe it makes
use of a service or utility function that happens to be in the same file as
ComponentA) then this could create an import cycle. This turns out to
happen quite regularly in larger Angular codebases.
TypeScript and the Ivy runtime have no issues with such cycles. However,
other tools are not so accepting. In particular the Closure Compiler is
very anti-cycle.
To mitigate this problem, it's necessary to detect when the insertion of
an import would create a cycle. ngtsc can then use a different strategy,
known as "remote scoping", instead of directly writing a reference from
one component to another. Under remote scoping, a function
'setComponentScope' is called after the declaration of the component's
module, which does not require the addition of new imports.
FW-647 #resolve
PR Close #28169
2019-01-15 15:32:10 -05:00
|
|
|
describe('cycle detection', () => {
|
|
|
|
it('should detect a simple cycle and use remote component scoping', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, NgModule} from '@angular/core';
|
|
|
|
import {NormalComponent} from './cyclic';
|
2019-02-05 09:47:35 -05:00
|
|
|
|
feat(ivy): detect cycles and use remote scoping of components if needed (#28169)
By its nature, Ivy alters the import graph of a TS program, adding imports
where template dependencies exist. For example, if ComponentA uses PipeB
in its template, Ivy will insert an import of PipeB into the file in which
ComponentA is declared.
Any insertion of an import into a program has the potential to introduce a
cycle into the import graph. If for some reason the file in which PipeB is
declared imports the file in which ComponentA is declared (maybe it makes
use of a service or utility function that happens to be in the same file as
ComponentA) then this could create an import cycle. This turns out to
happen quite regularly in larger Angular codebases.
TypeScript and the Ivy runtime have no issues with such cycles. However,
other tools are not so accepting. In particular the Closure Compiler is
very anti-cycle.
To mitigate this problem, it's necessary to detect when the insertion of
an import would create a cycle. ngtsc can then use a different strategy,
known as "remote scoping", instead of directly writing a reference from
one component to another. Under remote scoping, a function
'setComponentScope' is called after the declaration of the component's
module, which does not require the addition of new imports.
FW-647 #resolve
PR Close #28169
2019-01-15 15:32:10 -05:00
|
|
|
@Component({
|
|
|
|
selector: 'cyclic-component',
|
|
|
|
template: 'Importing this causes a cycle',
|
|
|
|
})
|
|
|
|
export class CyclicComponent {}
|
2019-02-05 09:47:35 -05:00
|
|
|
|
feat(ivy): detect cycles and use remote scoping of components if needed (#28169)
By its nature, Ivy alters the import graph of a TS program, adding imports
where template dependencies exist. For example, if ComponentA uses PipeB
in its template, Ivy will insert an import of PipeB into the file in which
ComponentA is declared.
Any insertion of an import into a program has the potential to introduce a
cycle into the import graph. If for some reason the file in which PipeB is
declared imports the file in which ComponentA is declared (maybe it makes
use of a service or utility function that happens to be in the same file as
ComponentA) then this could create an import cycle. This turns out to
happen quite regularly in larger Angular codebases.
TypeScript and the Ivy runtime have no issues with such cycles. However,
other tools are not so accepting. In particular the Closure Compiler is
very anti-cycle.
To mitigate this problem, it's necessary to detect when the insertion of
an import would create a cycle. ngtsc can then use a different strategy,
known as "remote scoping", instead of directly writing a reference from
one component to another. Under remote scoping, a function
'setComponentScope' is called after the declaration of the component's
module, which does not require the addition of new imports.
FW-647 #resolve
PR Close #28169
2019-01-15 15:32:10 -05:00
|
|
|
@NgModule({
|
|
|
|
declarations: [NormalComponent, CyclicComponent],
|
|
|
|
})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.write('cyclic.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
2019-02-05 09:47:35 -05:00
|
|
|
|
feat(ivy): detect cycles and use remote scoping of components if needed (#28169)
By its nature, Ivy alters the import graph of a TS program, adding imports
where template dependencies exist. For example, if ComponentA uses PipeB
in its template, Ivy will insert an import of PipeB into the file in which
ComponentA is declared.
Any insertion of an import into a program has the potential to introduce a
cycle into the import graph. If for some reason the file in which PipeB is
declared imports the file in which ComponentA is declared (maybe it makes
use of a service or utility function that happens to be in the same file as
ComponentA) then this could create an import cycle. This turns out to
happen quite regularly in larger Angular codebases.
TypeScript and the Ivy runtime have no issues with such cycles. However,
other tools are not so accepting. In particular the Closure Compiler is
very anti-cycle.
To mitigate this problem, it's necessary to detect when the insertion of
an import would create a cycle. ngtsc can then use a different strategy,
known as "remote scoping", instead of directly writing a reference from
one component to another. Under remote scoping, a function
'setComponentScope' is called after the declaration of the component's
module, which does not require the addition of new imports.
FW-647 #resolve
PR Close #28169
2019-01-15 15:32:10 -05:00
|
|
|
@Component({
|
|
|
|
selector: 'normal-component',
|
|
|
|
template: '<cyclic-component></cyclic-component>',
|
|
|
|
})
|
|
|
|
export class NormalComponent {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents)
|
2019-02-19 15:05:03 -05:00
|
|
|
.toMatch(
|
2019-04-19 12:52:21 -04:00
|
|
|
/i\d\.\u0275\u0275setComponentScope\(NormalComponent,\s+\[NormalComponent,\s+CyclicComponent\],\s+\[\]\)/);
|
|
|
|
expect(jsContents).not.toContain('/*__PURE__*/ i0.\u0275\u0275setComponentScope');
|
feat(ivy): detect cycles and use remote scoping of components if needed (#28169)
By its nature, Ivy alters the import graph of a TS program, adding imports
where template dependencies exist. For example, if ComponentA uses PipeB
in its template, Ivy will insert an import of PipeB into the file in which
ComponentA is declared.
Any insertion of an import into a program has the potential to introduce a
cycle into the import graph. If for some reason the file in which PipeB is
declared imports the file in which ComponentA is declared (maybe it makes
use of a service or utility function that happens to be in the same file as
ComponentA) then this could create an import cycle. This turns out to
happen quite regularly in larger Angular codebases.
TypeScript and the Ivy runtime have no issues with such cycles. However,
other tools are not so accepting. In particular the Closure Compiler is
very anti-cycle.
To mitigate this problem, it's necessary to detect when the insertion of
an import would create a cycle. ngtsc can then use a different strategy,
known as "remote scoping", instead of directly writing a reference from
one component to another. Under remote scoping, a function
'setComponentScope' is called after the declaration of the component's
module, which does not require the addition of new imports.
FW-647 #resolve
PR Close #28169
2019-01-15 15:32:10 -05:00
|
|
|
});
|
2019-02-28 14:00:47 -05:00
|
|
|
|
|
|
|
it('should detect a cycle added entirely during compilation', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {ACmp} from './a';
|
|
|
|
import {BCmp} from './b';
|
|
|
|
|
|
|
|
@NgModule({declarations: [ACmp, BCmp]})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
env.write('a.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'a-cmp',
|
|
|
|
template: '<b-cmp></b-cmp>',
|
|
|
|
})
|
|
|
|
export class ACmp {}
|
|
|
|
`);
|
|
|
|
env.write('b.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'b-cmp',
|
|
|
|
template: '<a-cmp></a-cmp>',
|
|
|
|
})
|
|
|
|
export class BCmp {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const aJsContents = env.getContents('a.js');
|
|
|
|
const bJsContents = env.getContents('b.js');
|
|
|
|
expect(aJsContents).toMatch(/import \* as i\d? from ".\/b"/);
|
|
|
|
expect(bJsContents).not.toMatch(/import \* as i\d? from ".\/a"/);
|
|
|
|
});
|
2019-03-19 16:10:51 -04:00
|
|
|
|
|
|
|
it('should not detect a potential cycle if it doesn\'t actually happen', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {ACmp} from './a';
|
|
|
|
import {BCmp} from './b';
|
|
|
|
|
|
|
|
@NgModule({declarations: [ACmp, BCmp]})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
env.write('a.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'a-cmp',
|
|
|
|
template: '<b-cmp></b-cmp>',
|
|
|
|
})
|
|
|
|
export class ACmp {}
|
|
|
|
`);
|
|
|
|
env.write('b.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'b-cmp',
|
|
|
|
template: 'does not use a-cmp',
|
|
|
|
})
|
|
|
|
export class BCmp {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).not.toContain('setComponentScope');
|
|
|
|
});
|
feat(ivy): detect cycles and use remote scoping of components if needed (#28169)
By its nature, Ivy alters the import graph of a TS program, adding imports
where template dependencies exist. For example, if ComponentA uses PipeB
in its template, Ivy will insert an import of PipeB into the file in which
ComponentA is declared.
Any insertion of an import into a program has the potential to introduce a
cycle into the import graph. If for some reason the file in which PipeB is
declared imports the file in which ComponentA is declared (maybe it makes
use of a service or utility function that happens to be in the same file as
ComponentA) then this could create an import cycle. This turns out to
happen quite regularly in larger Angular codebases.
TypeScript and the Ivy runtime have no issues with such cycles. However,
other tools are not so accepting. In particular the Closure Compiler is
very anti-cycle.
To mitigate this problem, it's necessary to detect when the insertion of
an import would create a cycle. ngtsc can then use a different strategy,
known as "remote scoping", instead of directly writing a reference from
one component to another. Under remote scoping, a function
'setComponentScope' is called after the declaration of the component's
module, which does not require the addition of new imports.
FW-647 #resolve
PR Close #28169
2019-01-15 15:32:10 -05:00
|
|
|
});
|
|
|
|
|
2019-02-08 17:11:33 -05:00
|
|
|
describe('multiple local refs', () => {
|
2018-12-03 20:13:23 -05:00
|
|
|
const getComponentScript = (template: string): string => `
|
|
|
|
import {Component, Directive, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({selector: 'my-cmp', template: \`${template}\`})
|
|
|
|
class Cmp {}
|
|
|
|
|
|
|
|
@NgModule({declarations: [Cmp]})
|
|
|
|
class Module {}
|
|
|
|
`;
|
|
|
|
|
2019-02-08 17:11:33 -05:00
|
|
|
const cases = [
|
2018-12-03 20:13:23 -05:00
|
|
|
`
|
|
|
|
<div #ref></div>
|
|
|
|
<div #ref></div>
|
|
|
|
`,
|
|
|
|
`
|
|
|
|
<ng-container>
|
|
|
|
<div #ref></div>
|
|
|
|
</ng-container>
|
|
|
|
<div #ref></div>
|
2019-02-08 17:11:33 -05:00
|
|
|
`,
|
2018-12-03 20:13:23 -05:00
|
|
|
`
|
|
|
|
<ng-template>
|
|
|
|
<div #ref></div>
|
|
|
|
</ng-template>
|
|
|
|
<div #ref></div>
|
|
|
|
`,
|
|
|
|
`
|
|
|
|
<div *ngIf="visible" #ref></div>
|
|
|
|
<div #ref></div>
|
|
|
|
`,
|
|
|
|
`
|
|
|
|
<div *ngFor="let item of items" #ref></div>
|
|
|
|
<div #ref></div>
|
|
|
|
`
|
|
|
|
];
|
|
|
|
|
2019-02-08 17:11:33 -05:00
|
|
|
cases.forEach(template => {
|
|
|
|
it('should not throw', () => {
|
2018-12-03 20:13:23 -05:00
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', getComponentScript(template));
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(0);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
2018-12-04 20:20:55 -05:00
|
|
|
|
2019-02-22 00:33:05 -05:00
|
|
|
it('should wrap "inputs" and "outputs" keys if they contain unsafe characters', () => {
|
|
|
|
env.tsconfig({});
|
|
|
|
env.write(`test.ts`, `
|
2019-03-05 20:55:11 -05:00
|
|
|
import {Directive, Input} from '@angular/core';
|
2019-02-22 00:33:05 -05:00
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[somedir]',
|
2019-03-05 20:55:11 -05:00
|
|
|
inputs: ['track-type', 'track-name', 'inputTrackName'],
|
|
|
|
outputs: ['output-track-type', 'output-track-name', 'outputTrackName']
|
2019-02-22 00:33:05 -05:00
|
|
|
})
|
2019-03-05 20:55:11 -05:00
|
|
|
export class SomeDir {
|
|
|
|
@Input('track-type') trackType: string;
|
|
|
|
@Input('track-name') trackName: string;
|
|
|
|
}
|
2019-02-22 00:33:05 -05:00
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const inputsAndOutputs = `
|
2019-03-05 20:55:11 -05:00
|
|
|
inputs: {
|
|
|
|
"track-type": "track-type",
|
|
|
|
"track-name": "track-name",
|
|
|
|
inputTrackName: "inputTrackName",
|
|
|
|
trackType: ["track-type", "trackType"],
|
|
|
|
trackName: ["track-name", "trackName"]
|
|
|
|
},
|
|
|
|
outputs: {
|
|
|
|
"output-track-type": "output-track-type",
|
|
|
|
"output-track-name": "output-track-name",
|
|
|
|
outputTrackName: "outputTrackName"
|
|
|
|
}
|
2019-02-22 00:33:05 -05:00
|
|
|
`;
|
|
|
|
expect(trim(jsContents)).toContain(trim(inputsAndOutputs));
|
|
|
|
});
|
|
|
|
|
2018-12-04 20:20:55 -05:00
|
|
|
it('should compile programs with typeRoots', () => {
|
|
|
|
// Write out a custom tsconfig.json that includes 'typeRoots' and 'files'. 'files' is necessary
|
|
|
|
// because otherwise TS picks up the testTypeRoot/test/index.d.ts file into the program
|
|
|
|
// automatically. Shims are also turned on (via allowEmptyCodegenFiles) because the shim
|
|
|
|
// ts.CompilerHost wrapper can break typeRoot functionality (which this test is meant to
|
|
|
|
// detect).
|
|
|
|
env.write('tsconfig.json', `{
|
|
|
|
"extends": "./tsconfig-base.json",
|
|
|
|
"angularCompilerOptions": {
|
|
|
|
"allowEmptyCodegenFiles": true
|
|
|
|
},
|
|
|
|
"compilerOptions": {
|
|
|
|
"typeRoots": ["./testTypeRoot"],
|
|
|
|
},
|
|
|
|
"files": ["./test.ts"]
|
|
|
|
}`);
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Test} from 'ambient';
|
|
|
|
console.log(Test);
|
|
|
|
`);
|
|
|
|
env.write('testTypeRoot/.exists', '');
|
|
|
|
env.write('testTypeRoot/test/index.d.ts', `
|
|
|
|
declare module 'ambient' {
|
|
|
|
export const Test = 'This is a test';
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
// Success is enough to indicate that this passes.
|
|
|
|
});
|
2018-12-04 12:42:44 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
describe('when processing external directives', () => {
|
|
|
|
it('should not emit multiple references to the same directive', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('node_modules/external/index.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2019-01-26 06:29:38 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
export declare class ExternalDir {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
|
2018-12-18 14:09:21 -05:00
|
|
|
}
|
2019-01-26 06:29:38 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
export declare class ExternalModule {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
|
2018-12-18 14:09:21 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, Directive, NgModule} from '@angular/core';
|
|
|
|
import {ExternalModule} from 'external';
|
2019-01-26 06:29:38 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
@Component({
|
|
|
|
template: '<div test></div>',
|
|
|
|
})
|
|
|
|
class Cmp {}
|
2019-01-26 06:29:38 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
@NgModule({
|
|
|
|
declarations: [Cmp],
|
|
|
|
// Multiple imports of the same module used to result in duplicate directive references
|
|
|
|
// in the output.
|
|
|
|
imports: [ExternalModule, ExternalModule],
|
|
|
|
})
|
|
|
|
class Module {}
|
|
|
|
`);
|
2018-12-04 12:42:44 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toMatch(/directives: \[i1\.ExternalDir\]/);
|
|
|
|
});
|
2018-12-04 12:42:44 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
it('should import directives by their external name', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('node_modules/external/index.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2018-12-18 14:09:21 -05:00
|
|
|
import {InternalDir} from './internal';
|
2018-12-04 12:42:44 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
export {InternalDir as ExternalDir} from './internal';
|
2018-12-04 12:42:44 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
export declare class ExternalModule {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<ExternalModule, [typeof InternalDir], never, [typeof InternalDir]>;
|
2018-12-18 14:09:21 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
env.write('node_modules/external/internal.d.ts', `
|
2018-12-04 12:42:44 -05:00
|
|
|
|
2018-12-18 14:09:21 -05:00
|
|
|
export declare class InternalDir {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<InternalDir, '[test]', never, never, never, never>;
|
2018-12-18 14:09:21 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, Directive, NgModule} from '@angular/core';
|
|
|
|
import {ExternalModule} from 'external';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
template: '<div test></div>',
|
|
|
|
})
|
|
|
|
class Cmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Cmp],
|
|
|
|
imports: [ExternalModule],
|
|
|
|
})
|
|
|
|
class Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toMatch(/directives: \[i1\.ExternalDir\]/);
|
|
|
|
});
|
2018-12-04 12:42:44 -05:00
|
|
|
});
|
2018-12-05 19:05:29 -05:00
|
|
|
|
|
|
|
describe('flat module indices', () => {
|
|
|
|
it('should generate a basic flat module index', () => {
|
|
|
|
env.tsconfig({
|
|
|
|
'flatModuleOutFile': 'flat.js',
|
|
|
|
});
|
|
|
|
env.write('test.ts', 'export const TEST = "this is a test";');
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('flat.js');
|
|
|
|
expect(jsContents).toContain('export * from \'./test\';');
|
|
|
|
});
|
|
|
|
|
2019-03-26 18:39:12 -04:00
|
|
|
it('should determine the flat module entry-point within multiple root files', () => {
|
|
|
|
env.tsconfig({
|
|
|
|
'flatModuleOutFile': 'flat.js',
|
|
|
|
});
|
|
|
|
env.write('ignored.ts', 'export const TEST = "this is ignored";');
|
|
|
|
env.write('index.ts', 'export const ENTRY = "this is the entry";');
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('flat.js');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
|
|
|
'export * from \'./index\';',
|
|
|
|
'Should detect the "index.ts" file as flat module entry-point.');
|
|
|
|
});
|
|
|
|
|
2018-12-05 19:05:29 -05:00
|
|
|
it('should generate a flat module with an id', () => {
|
|
|
|
env.tsconfig({
|
|
|
|
'flatModuleOutFile': 'flat.js',
|
|
|
|
'flatModuleId': '@mymodule',
|
|
|
|
});
|
|
|
|
env.write('test.ts', 'export const TEST = "this is a test";');
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const dtsContents = env.getContents('flat.d.ts');
|
|
|
|
expect(dtsContents).toContain('/// <amd-module name="@mymodule" />');
|
|
|
|
});
|
2018-12-13 14:52:20 -05:00
|
|
|
|
2019-01-12 13:00:39 -05:00
|
|
|
it('should generate a proper flat module index file when nested', () => {
|
|
|
|
env.tsconfig({
|
|
|
|
'flatModuleOutFile': './public-api/index.js',
|
|
|
|
});
|
|
|
|
|
|
|
|
env.write('test.ts', `export const SOME_EXPORT = 'some-export'`);
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
expect(env.getContents('./public-api/index.js')).toContain(`export * from '../test';`);
|
|
|
|
});
|
|
|
|
|
2018-12-13 14:52:20 -05:00
|
|
|
it('should report an error when a flat module index is requested but no entrypoint can be determined',
|
|
|
|
() => {
|
|
|
|
env.tsconfig({'flatModuleOutFile': 'flat.js'});
|
|
|
|
env.write('test.ts', 'export class Foo {}');
|
|
|
|
env.write('test2.ts', 'export class Bar {}');
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(1);
|
|
|
|
expect(errors[0].messageText)
|
|
|
|
.toBe(
|
|
|
|
'Angular compiler option "flatModuleOutFile" requires one and only one .ts file in the "files" field.');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should report an error when a visible directive is not exported', () => {
|
|
|
|
env.tsconfig({'flatModuleOutFile': 'flat.js'});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Directive, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
// The directive is not exported.
|
|
|
|
@Directive({selector: 'test'})
|
|
|
|
class Dir {}
|
|
|
|
|
|
|
|
// The module is, which makes the directive visible.
|
|
|
|
@NgModule({declarations: [Dir], exports: [Dir]})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(1);
|
|
|
|
expect(errors[0].messageText)
|
|
|
|
.toBe(
|
|
|
|
'Unsupported private class Dir. This class is visible ' +
|
|
|
|
'to consumers via Module -> Dir, but is not exported from the top-level library ' +
|
|
|
|
'entrypoint.');
|
|
|
|
|
|
|
|
// Verify that the error is for the correct class.
|
|
|
|
const id = expectTokenAtPosition(errors[0].file !, errors[0].start !, ts.isIdentifier);
|
|
|
|
expect(id.text).toBe('Dir');
|
|
|
|
expect(ts.isClassDeclaration(id.parent)).toBe(true);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should report an error when a deeply visible directive is not exported', () => {
|
|
|
|
env.tsconfig({'flatModuleOutFile': 'flat.js'});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Directive, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
// The directive is not exported.
|
|
|
|
@Directive({selector: 'test'})
|
|
|
|
class Dir {}
|
|
|
|
|
|
|
|
// Neither is the module which declares it - meaning the directive is not visible here.
|
|
|
|
@NgModule({declarations: [Dir], exports: [Dir]})
|
|
|
|
class DirModule {}
|
|
|
|
|
|
|
|
// The module is, which makes the directive visible.
|
|
|
|
@NgModule({exports: [DirModule]})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(2);
|
|
|
|
expect(errors[0].messageText)
|
|
|
|
.toBe(
|
|
|
|
'Unsupported private class DirModule. This class is ' +
|
|
|
|
'visible to consumers via Module -> DirModule, but is not exported from the top-level ' +
|
|
|
|
'library entrypoint.');
|
|
|
|
expect(errors[1].messageText)
|
|
|
|
.toBe(
|
|
|
|
'Unsupported private class Dir. This class is visible ' +
|
|
|
|
'to consumers via Module -> DirModule -> Dir, but is not exported from the top-level ' +
|
|
|
|
'library entrypoint.');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should report an error when a deeply visible module is not exported', () => {
|
|
|
|
env.tsconfig({'flatModuleOutFile': 'flat.js'});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Directive, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
// The directive is exported.
|
|
|
|
@Directive({selector: 'test'})
|
|
|
|
export class Dir {}
|
|
|
|
|
|
|
|
// The module which declares it is not.
|
|
|
|
@NgModule({declarations: [Dir], exports: [Dir]})
|
|
|
|
class DirModule {}
|
|
|
|
|
|
|
|
// The module is, which makes the module and directive visible.
|
|
|
|
@NgModule({exports: [DirModule]})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(1);
|
|
|
|
expect(errors[0].messageText)
|
|
|
|
.toBe(
|
|
|
|
'Unsupported private class DirModule. This class is ' +
|
|
|
|
'visible to consumers via Module -> DirModule, but is not exported from the top-level ' +
|
|
|
|
'library entrypoint.');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should not report an error when a non-exported module is imported by a visible one', () => {
|
|
|
|
env.tsconfig({'flatModuleOutFile': 'flat.js'});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Directive, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
// The directive is not exported.
|
|
|
|
@Directive({selector: 'test'})
|
|
|
|
class Dir {}
|
|
|
|
|
|
|
|
// Neither is the module which declares it.
|
|
|
|
@NgModule({declarations: [Dir], exports: [Dir]})
|
|
|
|
class DirModule {}
|
|
|
|
|
|
|
|
// This module is, but it doesn't re-export the module, so it doesn't make the module and
|
|
|
|
// directive visible.
|
|
|
|
@NgModule({imports: [DirModule]})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(0);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should not report an error when re-exporting an external symbol', () => {
|
|
|
|
env.tsconfig({'flatModuleOutFile': 'flat.js'});
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Directive, NgModule} from '@angular/core';
|
|
|
|
import {ExternalModule} from 'external';
|
|
|
|
|
|
|
|
// This module makes ExternalModule and ExternalDir visible.
|
|
|
|
@NgModule({exports: [ExternalModule]})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
env.write('node_modules/external/index.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2018-12-13 14:52:20 -05:00
|
|
|
|
|
|
|
export declare class ExternalDir {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
|
2018-12-13 14:52:20 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
export declare class ExternalModule {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
|
2018-12-13 14:52:20 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const errors = env.driveDiagnostics();
|
|
|
|
expect(errors.length).toBe(0);
|
|
|
|
});
|
2018-12-05 19:05:29 -05:00
|
|
|
});
|
2019-01-03 05:23:00 -05:00
|
|
|
|
|
|
|
it('should execute custom transformers', () => {
|
|
|
|
let beforeCount = 0;
|
|
|
|
let afterCount = 0;
|
|
|
|
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
class Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain({
|
2019-01-15 19:50:48 -05:00
|
|
|
beforeTs: [() => (sourceFile: ts.SourceFile) => {
|
2019-01-03 05:23:00 -05:00
|
|
|
beforeCount++;
|
|
|
|
return sourceFile;
|
|
|
|
}],
|
2019-01-15 19:50:48 -05:00
|
|
|
afterTs: [() => (sourceFile: ts.SourceFile) => {
|
2019-01-03 05:23:00 -05:00
|
|
|
afterCount++;
|
|
|
|
return sourceFile;
|
|
|
|
}],
|
|
|
|
});
|
|
|
|
|
|
|
|
expect(beforeCount).toBe(1);
|
|
|
|
expect(afterCount).toBe(1);
|
|
|
|
});
|
|
|
|
|
2019-02-13 21:13:29 -05:00
|
|
|
describe('@fileoverview Closure annotations', () => {
|
|
|
|
it('should be produced if not present in source file', () => {
|
|
|
|
env.tsconfig({
|
|
|
|
'annotateForClosureCompiler': true,
|
|
|
|
});
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
template: '<div class="test"></div>',
|
|
|
|
})
|
|
|
|
export class SomeComp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const fileoverview = `
|
|
|
|
/**
|
|
|
|
* @fileoverview added by tsickle
|
2019-02-02 04:02:16 -05:00
|
|
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
2019-02-13 21:13:29 -05:00
|
|
|
*/
|
|
|
|
`;
|
|
|
|
expect(trim(jsContents).startsWith(trim(fileoverview))).toBeTruthy();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should be produced for empty source files', () => {
|
|
|
|
env.tsconfig({
|
|
|
|
'annotateForClosureCompiler': true,
|
|
|
|
});
|
|
|
|
env.write(`test.ts`, ``);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const fileoverview = `
|
|
|
|
/**
|
|
|
|
* @fileoverview added by tsickle
|
2019-02-02 04:02:16 -05:00
|
|
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
2019-02-13 21:13:29 -05:00
|
|
|
*/
|
|
|
|
`;
|
|
|
|
expect(trim(jsContents).startsWith(trim(fileoverview))).toBeTruthy();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should always be at the very beginning of a script (if placed above imports)', () => {
|
|
|
|
env.tsconfig({
|
|
|
|
'annotateForClosureCompiler': true,
|
|
|
|
});
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
/**
|
|
|
|
* @fileoverview Some Comp overview
|
|
|
|
* @modName {some_comp}
|
|
|
|
*/
|
|
|
|
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
template: '<div class="test"></div>',
|
|
|
|
})
|
|
|
|
export class SomeComp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const fileoverview = `
|
|
|
|
/**
|
|
|
|
*
|
|
|
|
* @fileoverview Some Comp overview
|
|
|
|
* @modName {some_comp}
|
|
|
|
*
|
2019-02-02 04:02:16 -05:00
|
|
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
2019-02-13 21:13:29 -05:00
|
|
|
*/
|
|
|
|
`;
|
|
|
|
expect(trim(jsContents).startsWith(trim(fileoverview))).toBeTruthy();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should always be at the very beginning of a script (if placed above non-imports)', () => {
|
|
|
|
env.tsconfig({
|
|
|
|
'annotateForClosureCompiler': true,
|
|
|
|
});
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
/**
|
|
|
|
* @fileoverview Some Comp overview
|
|
|
|
* @modName {some_comp}
|
|
|
|
*/
|
|
|
|
|
|
|
|
const testConst = 'testConstValue';
|
|
|
|
const testFn = function() { return true; }
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const fileoverview = `
|
|
|
|
/**
|
|
|
|
*
|
|
|
|
* @fileoverview Some Comp overview
|
|
|
|
* @modName {some_comp}
|
|
|
|
*
|
2019-02-02 04:02:16 -05:00
|
|
|
* @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
|
2019-02-13 21:13:29 -05:00
|
|
|
*/
|
|
|
|
`;
|
|
|
|
expect(trim(jsContents).startsWith(trim(fileoverview))).toBeTruthy();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2019-01-03 13:04:06 -05:00
|
|
|
describe('sanitization', () => {
|
|
|
|
it('should generate sanitizers for unsafe attributes in hostBindings fn in Directives', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, Directive, HostBinding} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[unsafeAttrs]'
|
|
|
|
})
|
|
|
|
class UnsafeAttrsDirective {
|
|
|
|
@HostBinding('attr.href')
|
|
|
|
attrHref: string;
|
|
|
|
|
|
|
|
@HostBinding('attr.src')
|
|
|
|
attrSrc: string;
|
|
|
|
|
|
|
|
@HostBinding('attr.action')
|
|
|
|
attrAction: string;
|
|
|
|
|
|
|
|
@HostBinding('attr.profile')
|
|
|
|
attrProfile: string;
|
|
|
|
|
|
|
|
@HostBinding('attr.innerHTML')
|
|
|
|
attrInnerHTML: string;
|
|
|
|
|
|
|
|
@HostBinding('attr.title')
|
|
|
|
attrSafeTitle: string;
|
|
|
|
}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'foo',
|
|
|
|
template: '<a [unsafeAttrs]="ctxProp">Link Title</a>'
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const hostBindingsFn = `
|
|
|
|
hostBindings: function UnsafeAttrsDirective_HostBindings(rf, ctx, elIndex) {
|
|
|
|
if (rf & 1) {
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275allocHostVars(6);
|
2019-01-03 13:04:06 -05:00
|
|
|
}
|
|
|
|
if (rf & 2) {
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "href", i0.\u0275\u0275bind(ctx.attrHref), i0.\u0275\u0275sanitizeUrlOrResourceUrl);
|
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "src", i0.\u0275\u0275bind(ctx.attrSrc), i0.\u0275\u0275sanitizeUrlOrResourceUrl);
|
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "action", i0.\u0275\u0275bind(ctx.attrAction), i0.\u0275\u0275sanitizeUrl);
|
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "profile", i0.\u0275\u0275bind(ctx.attrProfile), i0.\u0275\u0275sanitizeResourceUrl);
|
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "innerHTML", i0.\u0275\u0275bind(ctx.attrInnerHTML), i0.\u0275\u0275sanitizeHtml);
|
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "title", i0.\u0275\u0275bind(ctx.attrSafeTitle));
|
2019-01-03 13:04:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
`;
|
|
|
|
expect(trim(jsContents)).toContain(trim(hostBindingsFn));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should generate sanitizers for unsafe properties in hostBindings fn in Directives', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component, Directive, HostBinding} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[unsafeProps]'
|
|
|
|
})
|
|
|
|
class UnsafePropsDirective {
|
|
|
|
@HostBinding('href')
|
|
|
|
propHref: string;
|
|
|
|
|
|
|
|
@HostBinding('src')
|
|
|
|
propSrc: string;
|
|
|
|
|
|
|
|
@HostBinding('action')
|
|
|
|
propAction: string;
|
|
|
|
|
|
|
|
@HostBinding('profile')
|
|
|
|
propProfile: string;
|
|
|
|
|
|
|
|
@HostBinding('innerHTML')
|
|
|
|
propInnerHTML: string;
|
|
|
|
|
|
|
|
@HostBinding('title')
|
|
|
|
propSafeTitle: string;
|
|
|
|
}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'foo',
|
|
|
|
template: '<a [unsafeProps]="ctxProp">Link Title</a>'
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const hostBindingsFn = `
|
|
|
|
hostBindings: function UnsafePropsDirective_HostBindings(rf, ctx, elIndex) {
|
|
|
|
if (rf & 1) {
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275allocHostVars(6);
|
2019-01-03 13:04:06 -05:00
|
|
|
}
|
|
|
|
if (rf & 2) {
|
2019-04-21 02:35:20 -04:00
|
|
|
i0.\u0275\u0275property("href", ctx.propHref, i0.\u0275\u0275sanitizeUrlOrResourceUrl, true);
|
|
|
|
i0.\u0275\u0275property("src", ctx.propSrc, i0.\u0275\u0275sanitizeUrlOrResourceUrl, true);
|
|
|
|
i0.\u0275\u0275property("action", ctx.propAction, i0.\u0275\u0275sanitizeUrl, true);
|
|
|
|
i0.\u0275\u0275property("profile", ctx.propProfile, i0.\u0275\u0275sanitizeResourceUrl, true);
|
|
|
|
i0.\u0275\u0275property("innerHTML", ctx.propInnerHTML, i0.\u0275\u0275sanitizeHtml, true);
|
|
|
|
i0.\u0275\u0275property("title", ctx.propSafeTitle, null, true);
|
2019-01-03 13:04:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
`;
|
|
|
|
expect(trim(jsContents)).toContain(trim(hostBindingsFn));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should not generate sanitizers for URL properties in hostBindings fn in Component', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write(`test.ts`, `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'foo',
|
|
|
|
template: '<a href="example.com">Link Title</a>',
|
|
|
|
host: {
|
|
|
|
'[src]': 'srcProp',
|
|
|
|
'[href]': 'hrefProp',
|
|
|
|
'[title]': 'titleProp',
|
|
|
|
'[attr.src]': 'srcAttr',
|
|
|
|
'[attr.href]': 'hrefAttr',
|
|
|
|
'[attr.title]': 'titleAttr',
|
|
|
|
}
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
const hostBindingsFn = `
|
|
|
|
hostBindings: function FooCmp_HostBindings(rf, ctx, elIndex) {
|
|
|
|
if (rf & 1) {
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275allocHostVars(6);
|
2019-01-03 13:04:06 -05:00
|
|
|
}
|
|
|
|
if (rf & 2) {
|
2019-04-21 02:35:20 -04:00
|
|
|
i0.\u0275\u0275property("src", ctx.srcProp, null, true);
|
|
|
|
i0.\u0275\u0275property("href", ctx.hrefProp, null, true);
|
|
|
|
i0.\u0275\u0275property("title", ctx.titleProp, null, true);
|
2019-04-19 12:52:21 -04:00
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "src", i0.\u0275\u0275bind(ctx.srcAttr));
|
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "href", i0.\u0275\u0275bind(ctx.hrefAttr));
|
|
|
|
i0.\u0275\u0275elementAttribute(elIndex, "title", i0.\u0275\u0275bind(ctx.titleAttr));
|
2019-01-03 13:04:06 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
`;
|
|
|
|
expect(trim(jsContents)).toContain(trim(hostBindingsFn));
|
|
|
|
});
|
|
|
|
});
|
2018-11-16 11:56:18 -05:00
|
|
|
|
2019-02-05 09:47:35 -05:00
|
|
|
describe('listLazyRoutes()', () => {
|
|
|
|
// clang-format off
|
|
|
|
const lazyRouteMatching = (
|
2019-03-15 16:45:08 -04:00
|
|
|
route: string, fromModulePath: RegExp, fromModuleName: string, toModulePath: RegExp,
|
|
|
|
toModuleName: string) => {
|
2019-02-05 09:47:35 -05:00
|
|
|
return {
|
|
|
|
route,
|
|
|
|
module: jasmine.objectContaining({
|
|
|
|
name: fromModuleName,
|
|
|
|
filePath: jasmine.stringMatching(fromModulePath),
|
|
|
|
}),
|
|
|
|
referencedModule: jasmine.objectContaining({
|
|
|
|
name: toModuleName,
|
|
|
|
filePath: jasmine.stringMatching(toModulePath),
|
|
|
|
}),
|
|
|
|
} as unknown as LazyRoute;
|
|
|
|
};
|
|
|
|
// clang-format on
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('node_modules/@angular/router/index.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {ModuleWithProviders, \u0275\u0275NgModuleDefWithMeta as \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2019-01-25 11:10:05 -05:00
|
|
|
|
2019-02-05 09:47:35 -05:00
|
|
|
export declare var ROUTES;
|
|
|
|
export declare class RouterModule {
|
|
|
|
static forRoot(arg1: any, arg2: any): ModuleWithProviders<RouterModule>;
|
|
|
|
static forChild(arg1: any): ModuleWithProviders<RouterModule>;
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<RouterModule, never, never, never>;
|
2019-02-05 09:47:35 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('when called without arguments', () => {
|
|
|
|
it('should list all routes', () => {
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '1', loadChildren: './lazy/lazy-1#Lazy1Module'},
|
|
|
|
{path: '2', loadChildren: './lazy/lazy-2#Lazy2Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
env.write('lazy/lazy-1.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy1Module {}
|
|
|
|
`);
|
|
|
|
env.write('lazy/lazy-2.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: '3', loadChildren: './lazy-3#Lazy3Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class Lazy2Module {}
|
|
|
|
`);
|
|
|
|
env.write('lazy/lazy-3.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy3Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes();
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-3#Lazy3Module', /\/lazy\/lazy-2\.ts$/, 'Lazy2Module', /\/lazy\/lazy-3\.ts$/,
|
|
|
|
'Lazy3Module'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy/lazy-1#Lazy1Module', /\/test\.ts$/, 'TestModule', /\/lazy\/lazy-1\.ts$/,
|
|
|
|
'Lazy1Module'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy/lazy-2#Lazy2Module', /\/test\.ts$/, 'TestModule', /\/lazy\/lazy-2\.ts$/,
|
|
|
|
'Lazy2Module'),
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should detect lazy routes in simple children routes', () => {
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'foo',
|
|
|
|
template: '<div>Foo</div>'
|
|
|
|
})
|
|
|
|
class FooCmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', children: [
|
|
|
|
{path: 'foo', component: FooCmp},
|
|
|
|
{path: 'lazy', loadChildren: './lazy#LazyModule'}
|
|
|
|
]},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
env.write('lazy.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class LazyModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes();
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy#LazyModule', /\/test\.ts$/, 'TestModule', /\/lazy\.ts$/, 'LazyModule'),
|
|
|
|
]);
|
|
|
|
});
|
2019-02-11 06:01:01 -05:00
|
|
|
|
|
|
|
it('should detect lazy routes in all root directories', () => {
|
|
|
|
env.tsconfig({}, ['./foo/other-root-dir', './bar/other-root-dir']);
|
|
|
|
env.write('src/test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', loadChildren: './lazy-foo#LazyFooModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
env.write('foo/other-root-dir/src/lazy-foo.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: '', loadChildren: './lazy-bar#LazyBarModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class LazyFooModule {}
|
|
|
|
`);
|
|
|
|
env.write('bar/other-root-dir/src/lazy-bar.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: '', loadChildren: './lazier-bar#LazierBarModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class LazyBarModule {}
|
|
|
|
`);
|
|
|
|
env.write('bar/other-root-dir/src/lazier-bar.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class LazierBarModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes();
|
|
|
|
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-foo#LazyFooModule', /\/test\.ts$/, 'TestModule',
|
|
|
|
/\/foo\/other-root-dir\/src\/lazy-foo\.ts$/, 'LazyFooModule'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-bar#LazyBarModule', /\/foo\/other-root-dir\/src\/lazy-foo\.ts$/,
|
|
|
|
'LazyFooModule', /\/bar\/other-root-dir\/src\/lazy-bar\.ts$/, 'LazyBarModule'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazier-bar#LazierBarModule', /\/bar\/other-root-dir\/src\/lazy-bar\.ts$/,
|
|
|
|
'LazyBarModule', /\/bar\/other-root-dir\/src\/lazier-bar\.ts$/, 'LazierBarModule'),
|
|
|
|
]);
|
|
|
|
});
|
2019-02-05 09:47:35 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
describe('when called with entry module', () => {
|
|
|
|
it('should throw if the entry module hasn\'t been analyzed', () => {
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: '', loadChildren: './lazy#LazyModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
2019-02-19 11:29:04 -05:00
|
|
|
const entryModule1 = path.posix.join(env.basePath, 'test#TestModule');
|
|
|
|
const entryModule2 = path.posix.join(env.basePath, 'not-test#TestModule');
|
|
|
|
const entryModule3 = path.posix.join(env.basePath, 'test#NotTestModule');
|
2019-02-05 09:47:35 -05:00
|
|
|
|
|
|
|
expect(() => env.driveRoutes(entryModule1)).not.toThrow();
|
|
|
|
expect(() => env.driveRoutes(entryModule2))
|
|
|
|
.toThrowError(`Failed to list lazy routes: Unknown module '${entryModule2}'.`);
|
|
|
|
expect(() => env.driveRoutes(entryModule3))
|
|
|
|
.toThrowError(`Failed to list lazy routes: Unknown module '${entryModule3}'.`);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should list all transitive lazy routes', () => {
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
import {Test1Module as Test1ModuleRenamed} from './test-1';
|
|
|
|
import {Test2Module} from './test-2';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
exports: [
|
|
|
|
Test1ModuleRenamed,
|
|
|
|
],
|
|
|
|
imports: [
|
|
|
|
Test2Module,
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', loadChildren: './lazy/lazy#LazyModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
env.write('test-1.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: 'one', loadChildren: './lazy-1/lazy-1#Lazy1Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class Test1Module {}
|
|
|
|
`);
|
|
|
|
env.write('test-2.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
exports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: 'two', loadChildren: './lazy-2/lazy-2#Lazy2Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class Test2Module {}
|
|
|
|
`);
|
|
|
|
env.write('lazy/lazy.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class LazyModule {}
|
|
|
|
`);
|
|
|
|
env.write('lazy-1/lazy-1.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy1Module {}
|
|
|
|
`);
|
|
|
|
env.write('lazy-2/lazy-2.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy2Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes(path.join(env.basePath, 'test#TestModule'));
|
|
|
|
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy/lazy#LazyModule', /\/test\.ts$/, 'TestModule', /\/lazy\/lazy\.ts$/,
|
|
|
|
'LazyModule'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-1/lazy-1#Lazy1Module', /\/test-1\.ts$/, 'Test1Module',
|
|
|
|
/\/lazy-1\/lazy-1\.ts$/, 'Lazy1Module'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-2/lazy-2#Lazy2Module', /\/test-2\.ts$/, 'Test2Module',
|
|
|
|
/\/lazy-2\/lazy-2\.ts$/, 'Lazy2Module'),
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore exports that do not refer to an `NgModule`', () => {
|
|
|
|
env.write('test-1.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
import {Test2Component, Test2Module} from './test-2';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
exports: [
|
|
|
|
Test2Component,
|
|
|
|
Test2Module,
|
|
|
|
],
|
|
|
|
imports: [
|
2019-02-19 20:36:26 -05:00
|
|
|
Test2Module,
|
2019-02-05 09:47:35 -05:00
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', loadChildren: './lazy-1/lazy-1#Lazy1Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class Test1Module {}
|
|
|
|
`);
|
|
|
|
env.write('test-2.ts', `
|
|
|
|
import {Component, NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-2',
|
|
|
|
template: '',
|
|
|
|
})
|
|
|
|
export class Test2Component {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [
|
|
|
|
Test2Component,
|
|
|
|
],
|
|
|
|
exports: [
|
|
|
|
Test2Component,
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: 'two', loadChildren: './lazy-2/lazy-2#Lazy2Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class Test2Module {}
|
|
|
|
`);
|
|
|
|
env.write('lazy-1/lazy-1.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy1Module {}
|
|
|
|
`);
|
|
|
|
env.write('lazy-2/lazy-2.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy2Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes(path.join(env.basePath, 'test-1#Test1Module'));
|
|
|
|
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-1/lazy-1#Lazy1Module', /\/test-1\.ts$/, 'Test1Module',
|
|
|
|
/\/lazy-1\/lazy-1\.ts$/, 'Lazy1Module'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-2/lazy-2#Lazy2Module', /\/test-2\.ts$/, 'Test2Module',
|
|
|
|
/\/lazy-2\/lazy-2\.ts$/, 'Lazy2Module'),
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should support `ModuleWithProviders`', () => {
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {ModuleWithProviders, NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: '', loadChildren: './lazy-2/lazy-2#Lazy2Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestRoutingModule {
|
|
|
|
static forRoot(): ModuleWithProviders<TestRoutingModule> {
|
|
|
|
return {
|
|
|
|
ngModule: TestRoutingModule,
|
|
|
|
providers: [],
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
TestRoutingModule.forRoot(),
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', loadChildren: './lazy-1/lazy-1#Lazy1Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
env.write('lazy-1/lazy-1.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy1Module {}
|
|
|
|
`);
|
|
|
|
env.write('lazy-2/lazy-2.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy2Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes(path.join(env.basePath, 'test#TestModule'));
|
|
|
|
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-1/lazy-1#Lazy1Module', /\/test\.ts$/, 'TestModule', /\/lazy-1\/lazy-1\.ts$/,
|
|
|
|
'Lazy1Module'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-2/lazy-2#Lazy2Module', /\/test\.ts$/, 'TestRoutingModule',
|
|
|
|
/\/lazy-2\/lazy-2\.ts$/, 'Lazy2Module'),
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should only process each module once', () => {
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: '', loadChildren: './lazy/lazy#LazyModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class SharedModule {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
SharedModule,
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', loadChildren: './lazy/lazy#LazyModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
env.write('lazy/lazy.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: '', loadChildren: '../lazier/lazier#LazierModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class LazyModule {}
|
|
|
|
`);
|
|
|
|
env.write('lazier/lazier.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class LazierModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes(path.join(env.basePath, 'test#TestModule'));
|
|
|
|
|
|
|
|
// `LazyModule` is referenced in both `SharedModule` and `TestModule`,
|
|
|
|
// but it is only processed once (hence one `LazierModule` entry).
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy/lazy#LazyModule', /\/test\.ts$/, 'TestModule', /\/lazy\/lazy\.ts$/,
|
|
|
|
'LazyModule'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy/lazy#LazyModule', /\/test\.ts$/, 'SharedModule', /\/lazy\/lazy\.ts$/,
|
|
|
|
'LazyModule'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'../lazier/lazier#LazierModule', /\/lazy\/lazy\.ts$/, 'LazyModule',
|
|
|
|
/\/lazier\/lazier\.ts$/, 'LazierModule'),
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
2019-02-11 06:01:01 -05:00
|
|
|
it('should detect lazy routes in all root directories', () => {
|
|
|
|
env.tsconfig({}, ['./foo/other-root-dir', './bar/other-root-dir']);
|
|
|
|
env.write('src/test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', loadChildren: './lazy-foo#LazyFooModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
env.write('foo/other-root-dir/src/lazy-foo.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: '', loadChildren: './lazy-bar#LazyBarModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class LazyFooModule {}
|
|
|
|
`);
|
|
|
|
env.write('bar/other-root-dir/src/lazy-bar.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forChild([
|
|
|
|
{path: '', loadChildren: './lazier-bar#LazierBarModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class LazyBarModule {}
|
|
|
|
`);
|
|
|
|
env.write('bar/other-root-dir/src/lazier-bar.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class LazierBarModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes(path.join(env.basePath, 'src/test#TestModule'));
|
|
|
|
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-foo#LazyFooModule', /\/test\.ts$/, 'TestModule',
|
|
|
|
/\/foo\/other-root-dir\/src\/lazy-foo\.ts$/, 'LazyFooModule'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy-bar#LazyBarModule', /\/foo\/other-root-dir\/src\/lazy-foo\.ts$/,
|
|
|
|
'LazyFooModule', /\/bar\/other-root-dir\/src\/lazy-bar\.ts$/, 'LazyBarModule'),
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazier-bar#LazierBarModule', /\/bar\/other-root-dir\/src\/lazy-bar\.ts$/,
|
|
|
|
'LazyBarModule', /\/bar\/other-root-dir\/src\/lazier-bar\.ts$/, 'LazierBarModule'),
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
2019-02-05 09:47:35 -05:00
|
|
|
it('should ignore modules not (transitively) referenced by the entry module', () => {
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', loadChildren: './lazy/lazy#Lazy1Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class Test1Module {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', loadChildren: './lazy/lazy#Lazy2Module'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class Test2Module {}
|
|
|
|
`);
|
|
|
|
env.write('lazy/lazy.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy1Module {}
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class Lazy2Module {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes(path.join(env.basePath, 'test#Test1Module'));
|
|
|
|
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy/lazy#Lazy1Module', /\/test\.ts$/, 'Test1Module', /\/lazy\/lazy\.ts$/,
|
|
|
|
'Lazy1Module'),
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore routes to unknown modules', () => {
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from '@angular/router';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [
|
|
|
|
RouterModule.forRoot([
|
|
|
|
{path: '', loadChildren: './unknown/unknown#UnknownModule'},
|
|
|
|
{path: '', loadChildren: './lazy/lazy#LazyModule'},
|
|
|
|
]),
|
|
|
|
],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
env.write('lazy/lazy.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class LazyModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const routes = env.driveRoutes(path.join(env.basePath, 'test#TestModule'));
|
|
|
|
|
|
|
|
expect(routes).toEqual([
|
|
|
|
lazyRouteMatching(
|
|
|
|
'./lazy/lazy#LazyModule', /\/test\.ts$/, 'TestModule', /\/lazy\/lazy\.ts$/,
|
|
|
|
'LazyModule'),
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
});
|
2018-11-16 11:56:18 -05:00
|
|
|
});
|
2019-02-01 18:33:41 -05:00
|
|
|
|
|
|
|
describe('ivy switch mode', () => {
|
|
|
|
it('should allow for symbols to be renamed when they use a SWITCH_IVY naming mechanism', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
export const FooCmp__POST_R3__ = 1;
|
|
|
|
export const FooCmp__PRE_R3__ = 2;
|
|
|
|
export const FooCmp = FooCmp__PRE_R3__;`);
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const source = env.getContents('test.js');
|
|
|
|
expect(source).toContain(`export var FooCmp = FooCmp__POST_R3__`);
|
|
|
|
expect(source).not.toContain(`export var FooCmp = FooCmp__PRE_R3__`);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should allow for SWITCH_IVY naming even even if it occurs outside of core', () => {
|
|
|
|
const content = `
|
|
|
|
export const Foo__POST_R3__ = 1;
|
|
|
|
export const Foo__PRE_R3__ = 2;
|
|
|
|
export const Foo = Foo__PRE_R3__;
|
|
|
|
`;
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test_outside_angular_core.ts', content);
|
|
|
|
env.write('test_inside_angular_core.ts', content + '\nexport const ITS_JUST_ANGULAR = true;');
|
|
|
|
env.driveMain();
|
|
|
|
|
|
|
|
const sourceTestOutsideAngularCore = env.getContents('test_outside_angular_core.js');
|
|
|
|
const sourceTestInsideAngularCore = env.getContents('test_inside_angular_core.js');
|
|
|
|
expect(sourceTestInsideAngularCore).toContain(sourceTestOutsideAngularCore);
|
|
|
|
});
|
|
|
|
});
|
2019-02-19 20:36:26 -05:00
|
|
|
|
|
|
|
describe('NgModule export aliasing', () => {
|
|
|
|
it('should use an alias to import a directive from a deep dependency', () => {
|
|
|
|
env.tsconfig({'_useHostForImportGeneration': true});
|
|
|
|
|
|
|
|
// 'alpha' declares the directive which will ultimately be imported.
|
|
|
|
env.write('alpha.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2019-02-19 20:36:26 -05:00
|
|
|
|
|
|
|
export declare class ExternalDir {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
|
2019-02-19 20:36:26 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
export declare class AlphaModule {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<AlphaModule, [typeof ExternalDir], never, [typeof ExternalDir]>;
|
2019-02-19 20:36:26 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
// 'beta' re-exports AlphaModule from alpha.
|
|
|
|
env.write('beta.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {\u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2019-02-19 20:36:26 -05:00
|
|
|
import {AlphaModule} from './alpha';
|
|
|
|
|
|
|
|
export declare class BetaModule {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<AlphaModule, never, never, [typeof AlphaModule]>;
|
2019-02-19 20:36:26 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
// The application imports BetaModule from beta, gaining visibility of ExternalDir from alpha.
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component, NgModule} from '@angular/core';
|
|
|
|
import {BetaModule} from './beta';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'cmp',
|
|
|
|
template: '<div test></div>',
|
|
|
|
})
|
|
|
|
export class Cmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Cmp],
|
|
|
|
imports: [BetaModule],
|
|
|
|
})
|
|
|
|
export class Module {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
|
|
|
|
// Expect that ExternalDir from alpha is imported via the re-export from beta.
|
|
|
|
expect(jsContents).toContain('import * as i1 from "root/beta";');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents).toContain('directives: [i1.\u0275ng$root$alpha$$ExternalDir]');
|
2019-02-19 20:36:26 -05:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should write alias ES2015 exports for NgModule exported directives', () => {
|
|
|
|
env.tsconfig({'_useHostForImportGeneration': true});
|
|
|
|
env.write('external.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2019-02-19 20:36:26 -05:00
|
|
|
import {LibModule} from './lib';
|
|
|
|
|
|
|
|
export declare class ExternalDir {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<ExternalDir, '[test]', never, never, never, never>;
|
2019-02-19 20:36:26 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
export declare class ExternalModule {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<ExternalModule, [typeof ExternalDir], never, [typeof ExternalDir, typeof LibModule]>;
|
2019-02-19 20:36:26 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
env.write('lib.d.ts', `
|
2019-04-19 12:52:21 -04:00
|
|
|
import {\u0275\u0275DirectiveDefWithMeta, \u0275\u0275NgModuleDefWithMeta} from '@angular/core';
|
2019-02-19 20:36:26 -05:00
|
|
|
|
|
|
|
export declare class LibDir {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngDirectiveDef: \u0275\u0275DirectiveDefWithMeta<LibDir, '[lib]', never, never, never, never>;
|
2019-02-19 20:36:26 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
export declare class LibModule {
|
2019-04-19 12:52:21 -04:00
|
|
|
static ngModuleDef: \u0275\u0275NgModuleDefWithMeta<LibModule, [typeof LibDir], never, [typeof LibDir]>;
|
2019-02-19 20:36:26 -05:00
|
|
|
}
|
|
|
|
`);
|
|
|
|
env.write('foo.ts', `
|
|
|
|
import {Directive, NgModule} from '@angular/core';
|
|
|
|
import {ExternalModule} from './external';
|
|
|
|
|
|
|
|
@Directive({selector: '[foo]'})
|
|
|
|
export class FooDir {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [FooDir],
|
|
|
|
exports: [FooDir, ExternalModule]
|
|
|
|
})
|
|
|
|
export class FooModule {}
|
|
|
|
`);
|
|
|
|
env.write('index.ts', `
|
|
|
|
import {Component, NgModule} from '@angular/core';
|
|
|
|
import {FooModule} from './foo';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'index',
|
|
|
|
template: '<div foo test lib></div>',
|
|
|
|
})
|
|
|
|
export class IndexCmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [IndexCmp],
|
|
|
|
exports: [FooModule],
|
|
|
|
})
|
|
|
|
export class IndexModule {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('index.js');
|
2019-04-19 12:52:21 -04:00
|
|
|
expect(jsContents)
|
|
|
|
.toContain('export { FooDir as \u0275ng$root$foo$$FooDir } from "root/foo";');
|
2019-02-19 20:36:26 -05:00
|
|
|
});
|
2019-03-08 17:03:49 -05:00
|
|
|
|
|
|
|
it('should escape unusual characters in aliased filenames', () => {
|
|
|
|
env.tsconfig({'_useHostForImportGeneration': true});
|
|
|
|
env.write('other._$test.ts', `
|
|
|
|
import {Directive, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({selector: 'test'})
|
|
|
|
export class TestDir {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [TestDir],
|
|
|
|
exports: [TestDir],
|
|
|
|
})
|
|
|
|
export class OtherModule {}
|
|
|
|
`);
|
|
|
|
env.write('index.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {OtherModule} from './other._$test';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
exports: [OtherModule],
|
|
|
|
})
|
|
|
|
export class IndexModule {}
|
|
|
|
`);
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('index.js');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2019-04-19 12:52:21 -04:00
|
|
|
'export { TestDir as \u0275ng$root$other___test$$TestDir } from "root/other._$test";');
|
2019-03-08 17:03:49 -05:00
|
|
|
});
|
2019-02-19 20:36:26 -05:00
|
|
|
});
|
2019-02-26 17:48:42 -05:00
|
|
|
|
|
|
|
describe('inline resources', () => {
|
|
|
|
it('should process inline <style> tags', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<style>h1 {font-size: larger}</style>',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('styles: ["h1[_ngcontent-%COMP%] {font-size: larger}"]');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should process inline <link> tags', () => {
|
|
|
|
env.tsconfig();
|
|
|
|
env.write('style.css', `h1 {font-size: larger}`);
|
|
|
|
env.write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<link rel="stylesheet" href="./style.css">',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
env.driveMain();
|
|
|
|
const jsContents = env.getContents('test.js');
|
|
|
|
expect(jsContents).toContain('styles: ["h1[_ngcontent-%COMP%] {font-size: larger}"]');
|
|
|
|
});
|
|
|
|
});
|
2018-04-06 12:53:10 -04:00
|
|
|
});
|
2018-12-13 14:52:20 -05:00
|
|
|
|
|
|
|
function expectTokenAtPosition<T extends ts.Node>(
|
|
|
|
sf: ts.SourceFile, pos: number, guard: (node: ts.Node) => node is T): T {
|
|
|
|
// getTokenAtPosition is part of TypeScript's private API.
|
|
|
|
const node = (ts as any).getTokenAtPosition(sf, pos) as ts.Node;
|
|
|
|
expect(guard(node)).toBe(true);
|
|
|
|
return node as T;
|
|
|
|
}
|
2019-01-08 16:02:11 -05:00
|
|
|
|
|
|
|
function normalize(input: string): string {
|
|
|
|
return input.replace(/\s+/g, ' ').trim();
|
2019-01-11 08:50:26 -05:00
|
|
|
}
|