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
|
|
|
|
*/
|
|
|
|
|
|
|
|
import * as fs from 'fs';
|
|
|
|
import * as path from 'path';
|
|
|
|
import * as ts from 'typescript';
|
|
|
|
|
|
|
|
import {main, readCommandLineAndConfiguration, watchMode} from '../../src/main';
|
|
|
|
import {TestSupport, isInBazel, makeTempDir, setup} from '../test_support';
|
|
|
|
|
|
|
|
function setupFakeCore(support: TestSupport): void {
|
|
|
|
const fakeCore = path.join(
|
|
|
|
process.env.TEST_SRCDIR, 'angular/packages/compiler-cli/test/ngtsc/fake_core/npm_package');
|
|
|
|
|
|
|
|
const nodeModulesPath = path.join(support.basePath, 'node_modules');
|
|
|
|
const angularCoreDirectory = path.join(nodeModulesPath, '@angular/core');
|
|
|
|
|
|
|
|
fs.symlinkSync(fakeCore, angularCoreDirectory);
|
|
|
|
}
|
|
|
|
|
|
|
|
function getNgRootDir() {
|
|
|
|
const moduleFilename = module.filename.replace(/\\/g, '/');
|
|
|
|
const distIndex = moduleFilename.indexOf('/dist/all');
|
|
|
|
return moduleFilename.substr(0, distIndex);
|
|
|
|
}
|
|
|
|
|
|
|
|
describe('ngtsc behavioral tests', () => {
|
|
|
|
if (!isInBazel()) {
|
|
|
|
// These tests should be excluded from the non-Bazel build.
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
let basePath: string;
|
|
|
|
let outDir: string;
|
|
|
|
let write: (fileName: string, content: string) => void;
|
|
|
|
let errorSpy: jasmine.Spy&((s: string) => void);
|
|
|
|
|
|
|
|
function shouldExist(fileName: string) {
|
|
|
|
if (!fs.existsSync(path.resolve(outDir, fileName))) {
|
|
|
|
throw new Error(`Expected ${fileName} to be emitted (outDir: ${outDir})`);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function shouldNotExist(fileName: string) {
|
|
|
|
if (fs.existsSync(path.resolve(outDir, fileName))) {
|
|
|
|
throw new Error(`Did not expect ${fileName} to be emitted (outDir: ${outDir})`);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function getContents(fileName: string): string {
|
|
|
|
shouldExist(fileName);
|
|
|
|
const modulePath = path.resolve(outDir, fileName);
|
|
|
|
return fs.readFileSync(modulePath, 'utf8');
|
|
|
|
}
|
|
|
|
|
2018-07-28 01:57:44 -04:00
|
|
|
function writeConfig(extraOpts: {[key: string]: string | boolean} = {}): void {
|
|
|
|
const opts = JSON.stringify({...extraOpts, 'enableIvy': 'ngtsc'});
|
|
|
|
const tsconfig: string =
|
|
|
|
`{"extends": "./tsconfig-base.json", "angularCompilerOptions": ${opts}}`;
|
2018-04-06 12:53:10 -04:00
|
|
|
write('tsconfig.json', tsconfig);
|
|
|
|
}
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
errorSpy = jasmine.createSpy('consoleError').and.callFake(console.error);
|
|
|
|
const support = setup();
|
|
|
|
basePath = support.basePath;
|
|
|
|
outDir = path.join(basePath, 'built');
|
|
|
|
process.chdir(basePath);
|
|
|
|
write = (fileName: string, content: string) => { support.write(fileName, content); };
|
|
|
|
|
|
|
|
setupFakeCore(support);
|
|
|
|
write('tsconfig-base.json', `{
|
|
|
|
"compilerOptions": {
|
|
|
|
"experimentalDecorators": true,
|
|
|
|
"skipLibCheck": true,
|
|
|
|
"noImplicitAny": true,
|
|
|
|
"types": [],
|
|
|
|
"outDir": "built",
|
|
|
|
"rootDir": ".",
|
|
|
|
"baseUrl": ".",
|
|
|
|
"declaration": true,
|
|
|
|
"target": "es5",
|
|
|
|
"module": "es2015",
|
|
|
|
"moduleResolution": "node",
|
|
|
|
"lib": ["es6", "dom"],
|
|
|
|
"typeRoots": ["node_modules/@types"]
|
|
|
|
},
|
|
|
|
"angularCompilerOptions": {
|
|
|
|
"enableIvy": "ngtsc"
|
|
|
|
}
|
|
|
|
}`);
|
|
|
|
});
|
|
|
|
|
2018-05-31 18:50:02 -04:00
|
|
|
it('should compile Injectables without errors', () => {
|
2018-04-06 12:53:10 -04:00
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class Dep {}
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class Service {
|
|
|
|
constructor(dep: Dep) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).toContain('Dep.ngInjectableDef =');
|
|
|
|
expect(jsContents).toContain('Service.ngInjectableDef =');
|
|
|
|
expect(jsContents).not.toContain('__decorate');
|
|
|
|
const dtsContents = getContents('test.d.ts');
|
2018-07-13 17:32:46 -04:00
|
|
|
expect(dtsContents).toContain('static ngInjectableDef: i0.ɵInjectableDef<Dep>;');
|
|
|
|
expect(dtsContents).toContain('static ngInjectableDef: i0.ɵInjectableDef<Service>;');
|
2018-04-06 12:53:10 -04:00
|
|
|
});
|
2018-05-31 18:50:02 -04:00
|
|
|
|
|
|
|
it('should compile Components without errors', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
template: 'this is a test',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).toContain('TestCmp.ngComponentDef = i0.ɵdefineComponent');
|
|
|
|
expect(jsContents).not.toContain('__decorate');
|
|
|
|
|
|
|
|
const dtsContents = getContents('test.d.ts');
|
2018-06-29 17:17:42 -04:00
|
|
|
expect(dtsContents).toContain('static ngComponentDef: i0.ɵComponentDef<TestCmp, \'test-cmp\'>');
|
2018-05-31 18:50:02 -04:00
|
|
|
});
|
|
|
|
|
2018-06-26 18:01:09 -04:00
|
|
|
it('should compile Components without errors', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
templateUrl: './dir/test.html',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
`);
|
|
|
|
write('dir/test.html', '<p>Hello World</p>');
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).toContain('Hello World');
|
|
|
|
});
|
|
|
|
|
2018-05-31 18:50:02 -04:00
|
|
|
it('should compile NgModules without errors', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {Component, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test-cmp',
|
|
|
|
template: 'this is a test',
|
|
|
|
})
|
|
|
|
export class TestCmp {}
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [TestCmp],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
|
|
|
'i0.ɵdefineNgModule({ type: TestModule, bootstrap: [], ' +
|
|
|
|
'declarations: [TestCmp], imports: [], exports: [] })');
|
|
|
|
|
|
|
|
const dtsContents = getContents('test.d.ts');
|
2018-06-29 17:17:42 -04:00
|
|
|
expect(dtsContents).toContain('static ngComponentDef: i0.ɵComponentDef<TestCmp, \'test-cmp\'>');
|
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(
|
|
|
|
'static ngModuleDef: i0.ɵNgModuleDef<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
|
|
|
|
|
|
|
it('should compile NgModules with services without errors', () => {
|
|
|
|
writeConfig();
|
|
|
|
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, useValue: 'test'}],
|
|
|
|
imports: [OtherModule],
|
|
|
|
})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).toContain('i0.ɵdefineNgModule({ type: TestModule,');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
|
|
|
`TestModule.ngInjectorDef = i0.defineInjector({ 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
|
|
|
|
|
|
|
const dtsContents = getContents('test.d.ts');
|
|
|
|
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(
|
|
|
|
'static ngModuleDef: i0.ɵNgModuleDef<TestModule, [typeof TestCmp], [typeof OtherModule], never>');
|
2018-06-29 17:17:42 -04:00
|
|
|
expect(dtsContents).toContain('static ngInjectorDef: i0.ɵInjectorDef');
|
2018-06-18 19:28:02 -04:00
|
|
|
});
|
2018-06-26 13:44:22 -04: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', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {Foo} from './foo';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Foo],
|
|
|
|
})
|
|
|
|
export class FooModule {}
|
|
|
|
`);
|
|
|
|
write('foo.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
@Component({selector: 'foo', template: ''})
|
|
|
|
export class Foo {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
const dtsContents = getContents('test.d.ts');
|
|
|
|
|
|
|
|
expect(jsContents).toContain('import { Foo } from \'./foo\';');
|
|
|
|
expect(jsContents).not.toMatch(/as i[0-9] from '.\/foo'/);
|
|
|
|
expect(dtsContents).toContain('as i1 from \'./foo\';');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should compile NgModules with references to absolute components', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {Foo} from 'foo';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Foo],
|
|
|
|
})
|
|
|
|
export class FooModule {}
|
|
|
|
`);
|
|
|
|
write('node_modules/foo/index.d.ts', `
|
|
|
|
import * as i0 from '@angular/core';
|
|
|
|
export class Foo {
|
|
|
|
static ngComponentDef: i0.ɵComponentDef<Foo, 'foo'>;
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
const dtsContents = getContents('test.d.ts');
|
|
|
|
|
|
|
|
expect(jsContents).toContain('import { Foo } from \'foo\';');
|
|
|
|
expect(jsContents).not.toMatch(/as i[0-9] from 'foo'/);
|
|
|
|
expect(dtsContents).toContain('as i1 from \'foo\';');
|
|
|
|
});
|
|
|
|
|
2018-06-26 13:44:22 -04:00
|
|
|
it('should compile Pipes without errors', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
@Pipe({
|
|
|
|
name: 'test-pipe',
|
|
|
|
pure: false,
|
|
|
|
})
|
|
|
|
export class TestPipe {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
const dtsContents = getContents('test.d.ts');
|
|
|
|
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
|
|
|
'TestPipe.ngPipeDef = i0.ɵdefinePipe({ name: "test-pipe", type: TestPipe, ' +
|
2018-07-16 19:36:31 -04:00
|
|
|
'factory: function TestPipe_Factory(t) { return new (t || TestPipe)(); }, pure: false })');
|
2018-06-26 13:44:22 -04:00
|
|
|
expect(dtsContents).toContain('static ngPipeDef: i0.ɵPipeDef<TestPipe, \'test-pipe\'>;');
|
|
|
|
});
|
|
|
|
|
2018-07-03 19:13:54 -04:00
|
|
|
it('should compile pure Pipes without errors', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
@Pipe({
|
|
|
|
name: 'test-pipe',
|
|
|
|
})
|
|
|
|
export class TestPipe {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
const dtsContents = getContents('test.d.ts');
|
|
|
|
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
|
|
|
'TestPipe.ngPipeDef = i0.ɵdefinePipe({ name: "test-pipe", type: TestPipe, ' +
|
2018-07-16 19:36:31 -04:00
|
|
|
'factory: function TestPipe_Factory(t) { return new (t || TestPipe)(); }, pure: true })');
|
2018-07-03 19:13:54 -04:00
|
|
|
expect(dtsContents).toContain('static ngPipeDef: i0.ɵPipeDef<TestPipe, \'test-pipe\'>;');
|
|
|
|
});
|
|
|
|
|
2018-06-26 13:44:22 -04:00
|
|
|
it('should compile Pipes with dependencies', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {Pipe} from '@angular/core';
|
|
|
|
|
|
|
|
export class Dep {}
|
|
|
|
|
|
|
|
@Pipe({
|
|
|
|
name: 'test-pipe',
|
|
|
|
pure: false,
|
|
|
|
})
|
|
|
|
export class TestPipe {
|
|
|
|
constructor(dep: Dep) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
2018-07-16 19:36:31 -04:00
|
|
|
expect(jsContents).toContain('return new (t || TestPipe)(i0.ɵdirectiveInject(Dep));');
|
2018-06-26 13:44:22 -04:00
|
|
|
});
|
|
|
|
|
|
|
|
it('should include @Pipes in @NgModule scopes', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
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 {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).toContain('pipes: [TestPipe]');
|
|
|
|
|
|
|
|
const dtsContents = 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)
|
|
|
|
.toContain('i0.ɵNgModuleDef<TestModule, [typeof TestPipe,typeof TestCmp], never, never>');
|
2018-06-26 13:44:22 -04:00
|
|
|
});
|
2018-07-09 14:36:30 -04:00
|
|
|
|
2018-07-09 14:39:15 -04:00
|
|
|
it('should unwrap a ModuleWithProviders function if a generic type is provided for it', () => {
|
2018-07-09 14:36:30 -04:00
|
|
|
writeConfig();
|
|
|
|
write(`test.ts`, `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {RouterModule} from 'router';
|
|
|
|
|
|
|
|
@NgModule({imports: [RouterModule.forRoot()]})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
write('node_modules/router/index.d.ts', `
|
|
|
|
import {ModuleWithProviders} from '@angular/core';
|
|
|
|
|
|
|
|
declare class RouterModule {
|
|
|
|
static forRoot(): ModuleWithProviders<RouterModule>;
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
2018-07-10 12:59:29 -04:00
|
|
|
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).toContain('imports: [[RouterModule.forRoot()]]');
|
|
|
|
|
2018-07-09 14:36:30 -04:00
|
|
|
const dtsContents = getContents('test.d.ts');
|
|
|
|
expect(dtsContents).toContain(`import * as i1 from 'router';`);
|
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)
|
|
|
|
.toContain('i0.ɵNgModuleDef<TestModule, never, [typeof i1.RouterModule], never>');
|
2018-07-09 14:36:30 -04:00
|
|
|
});
|
2018-07-10 12:57:48 -04:00
|
|
|
|
|
|
|
it('should inject special types according to the metadata', () => {
|
|
|
|
writeConfig();
|
|
|
|
write(`test.ts`, `
|
|
|
|
import {
|
|
|
|
Attribute,
|
|
|
|
ChangeDetectorRef,
|
|
|
|
Component,
|
|
|
|
ElementRef,
|
|
|
|
Injector,
|
|
|
|
TemplateRef,
|
|
|
|
ViewContainerRef,
|
|
|
|
} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: 'Test',
|
|
|
|
})
|
|
|
|
class FooCmp {
|
|
|
|
constructor(
|
|
|
|
@Attribute("test") attr: string,
|
|
|
|
cdr: ChangeDetectorRef,
|
|
|
|
er: ElementRef,
|
|
|
|
i: Injector,
|
|
|
|
tr: TemplateRef,
|
|
|
|
vcr: ViewContainerRef,
|
|
|
|
) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain(
|
2018-07-16 19:36:31 -04:00
|
|
|
`factory: function FooCmp_Factory(t) { return new (t || FooCmp)(i0.ɵinjectAttribute("test"), i0.ɵinjectChangeDetectorRef(), i0.ɵinjectElementRef(), i0.ɵdirectiveInject(i0.INJECTOR), i0.ɵinjectTemplateRef(), i0.ɵinjectViewContainerRef()); }`);
|
2018-07-10 12:57:48 -04:00
|
|
|
});
|
2018-07-18 12:32:36 -04:00
|
|
|
|
|
|
|
it('should generate queries for components', () => {
|
|
|
|
writeConfig();
|
|
|
|
write(`test.ts`, `
|
|
|
|
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) {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).toContain(`i0.ɵQ(null, ["bar"], true, TemplateRef)`);
|
|
|
|
expect(jsContents).toContain(`i0.ɵQ(null, TemplateRef, false)`);
|
|
|
|
expect(jsContents).toContain(`i0.ɵQ(null, ["test2"], true)`);
|
|
|
|
expect(jsContents).toContain(`i0.ɵQ(0, ["accessor"], true)`);
|
|
|
|
expect(jsContents).toContain(`i0.ɵQ(1, ["test1"], true)`);
|
|
|
|
});
|
2018-07-18 12:50:16 -04:00
|
|
|
|
2018-07-24 19:05:23 -04:00
|
|
|
it('should handle queries that use forwardRef', () => {
|
|
|
|
writeConfig();
|
|
|
|
write(`test.ts`, `
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).toContain(`i0.ɵQ(null, TemplateRef, true)`);
|
|
|
|
expect(jsContents).toContain(`i0.ɵQ(null, ViewContainerRef, true)`);
|
|
|
|
});
|
|
|
|
|
2018-07-18 12:50:16 -04:00
|
|
|
it('should generate host bindings for directives', () => {
|
|
|
|
writeConfig();
|
|
|
|
write(`test.ts`, `
|
|
|
|
import {Component, HostBinding, HostListener, TemplateRef} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: 'Test',
|
|
|
|
host: {
|
|
|
|
'[attr.hello]': 'foo',
|
|
|
|
'(click)': 'onClick($event)',
|
|
|
|
'[prop]': 'bar',
|
|
|
|
},
|
|
|
|
})
|
|
|
|
class FooCmp {
|
|
|
|
onClick(event: any): void {}
|
|
|
|
|
|
|
|
@HostBinding('class.someclass')
|
|
|
|
get someClass(): boolean { return false; }
|
|
|
|
|
|
|
|
@HostListener('onChange', ['arg'])
|
|
|
|
onChange(event: any, arg: any): void {}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).toContain(`i0.ɵp(elIndex, "attr.hello", i0.ɵb(i0.ɵd(dirIndex).foo));`);
|
|
|
|
expect(jsContents).toContain(`i0.ɵp(elIndex, "prop", i0.ɵb(i0.ɵd(dirIndex).bar));`);
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain('i0.ɵp(elIndex, "class.someclass", i0.ɵb(i0.ɵd(dirIndex).someClass))');
|
|
|
|
expect(jsContents).toContain('i0.ɵd(dirIndex).onClick($event)');
|
|
|
|
expect(jsContents).toContain('i0.ɵd(dirIndex).onChange(i0.ɵd(dirIndex).arg)');
|
|
|
|
});
|
2018-07-25 14:16:00 -04:00
|
|
|
|
|
|
|
it('should correctly recognize local symbols', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('module.ts', `
|
|
|
|
import {NgModule} from '@angular/core';
|
|
|
|
import {Dir, Comp} from './test';
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
declarations: [Dir, Comp],
|
|
|
|
exports: [Dir, Comp],
|
|
|
|
})
|
|
|
|
class Module {}
|
|
|
|
`);
|
|
|
|
write(`test.ts`, `
|
|
|
|
import {Component, Directive} from '@angular/core';
|
|
|
|
|
|
|
|
@Directive({
|
|
|
|
selector: '[dir]',
|
|
|
|
})
|
|
|
|
export class Dir {}
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
selector: 'test',
|
|
|
|
template: '<div dir>Test</div>',
|
|
|
|
})
|
|
|
|
export class Comp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
expect(jsContents).not.toMatch(/import \* as i[0-9] from ['"].\/test['"]/);
|
|
|
|
});
|
2018-07-28 01:57:44 -04:00
|
|
|
|
|
|
|
it('should generate correct factory stubs for a test module', () => {
|
|
|
|
writeConfig({'allowEmptyCodegenFiles': true});
|
|
|
|
|
|
|
|
write('test.ts', `
|
|
|
|
import {Injectable, NgModule} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class NotAModule {}
|
|
|
|
|
|
|
|
@NgModule({})
|
|
|
|
export class TestModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
write('empty.ts', `
|
|
|
|
import {Injectable} from '@angular/core';
|
|
|
|
|
|
|
|
@Injectable()
|
|
|
|
export class NotAModule {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
|
|
|
|
const factoryContents = getContents('test.ngfactory.js');
|
|
|
|
expect(factoryContents).toContain(`import * as i0 from '@angular/core';`);
|
|
|
|
expect(factoryContents).toContain(`import { NotAModule, TestModule } from './test';`);
|
|
|
|
expect(factoryContents)
|
|
|
|
.toContain(`export var TestModuleNgFactory = new i0.ɵNgModuleFactory(TestModule);`);
|
|
|
|
expect(factoryContents).not.toContain(`NotAModuleNgFactory`);
|
|
|
|
expect(factoryContents).not.toContain('ɵNonEmptyModule');
|
|
|
|
|
|
|
|
const emptyFactory = getContents('empty.ngfactory.js');
|
|
|
|
expect(emptyFactory).toContain(`import * as i0 from '@angular/core';`);
|
|
|
|
expect(emptyFactory).toContain(`export var ɵNonEmptyModule = true;`);
|
|
|
|
});
|
2018-08-06 05:48:26 -04:00
|
|
|
|
|
|
|
it('should compile a banana-in-a-box inside of a template', () => {
|
|
|
|
writeConfig();
|
|
|
|
write('test.ts', `
|
|
|
|
import {Component} from '@angular/core';
|
|
|
|
|
|
|
|
@Component({
|
|
|
|
template: '<div *tmpl [(bananaInABox)]="prop"></div>',
|
|
|
|
selector: 'test'
|
|
|
|
})
|
|
|
|
class TestCmp {}
|
|
|
|
`);
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
});
|
2018-07-16 19:36:31 -04:00
|
|
|
|
|
|
|
it('generates inherited factory definitions', () => {
|
|
|
|
writeConfig();
|
|
|
|
write(`test.ts`, `
|
|
|
|
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!);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
`);
|
|
|
|
|
|
|
|
|
|
|
|
const exitCode = main(['-p', basePath], errorSpy);
|
|
|
|
expect(errorSpy).not.toHaveBeenCalled();
|
|
|
|
expect(exitCode).toBe(0);
|
|
|
|
const jsContents = getContents('test.js');
|
|
|
|
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain('function Base_Factory(t) { return new (t || Base)(i0.inject(Dep)); }');
|
|
|
|
expect(jsContents).toContain('var ɵChild_BaseFactory = i0.ɵgetInheritedFactory(Child)');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain('function Child_Factory(t) { return ɵChild_BaseFactory((t || Child)); }');
|
|
|
|
expect(jsContents)
|
|
|
|
.toContain('function GrandChild_Factory(t) { return new (t || GrandChild)(); }');
|
|
|
|
});
|
2018-04-06 12:53:10 -04:00
|
|
|
});
|