2019-04-29 04:54:30 -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 ts from 'typescript';
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system';
|
|
|
|
import {TestFile, runInEachFileSystem} from '../../../src/ngtsc/file_system/testing';
|
fix(ivy): in ngcc, handle inline exports in commonjs code (#32129)
One of the compiler's tasks is to enumerate the exports of a given ES
module. This can happen for example to resolve `foo.bar` where `foo` is a
namespace import:
```typescript
import * as foo from './foo';
@NgModule({
directives: [foo.DIRECTIVES],
})
```
In this case, the compiler must enumerate the exports of `foo.ts` in order
to evaluate the expression `foo.DIRECTIVES`.
When this operation occurs under ngcc, it must deal with the different
module formats and types of exports that occur. In commonjs code, a problem
arises when certain exports are downleveled.
```typescript
export const DIRECTIVES = [
FooDir,
BarDir,
];
```
can be downleveled to:
```javascript
exports.DIRECTIVES = [
FooDir,
BarDir,
```
Previously, ngtsc and ngcc expected that any export would have an associated
`ts.Declaration` node. `export class`, `export function`, etc. all retain
`ts.Declaration`s even when downleveled. But the `export const` construct
above does not. Therefore, ngcc would not detect `DIRECTIVES` as an export
of `foo.ts`, and the evaluation of `foo.DIRECTIVES` would therefore fail.
To solve this problem, the core concept of an exported `Declaration`
according to the `ReflectionHost` API is split into a `ConcreteDeclaration`
which has a `ts.Declaration`, and an `InlineDeclaration` which instead has
a `ts.Expression`. Differentiating between these allows ngcc to return an
`InlineDeclaration` for `DIRECTIVES` and correctly keep track of this
export.
PR Close #32129
2019-08-13 19:08:53 -04:00
|
|
|
import {ClassMemberKind, CtorParameter, Import, InlineDeclaration, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection';
|
2019-06-06 15:22:32 -04:00
|
|
|
import {getDeclaration} from '../../../src/ngtsc/testing';
|
|
|
|
import {loadFakeCore, loadTestFiles} from '../../../test/helpers';
|
2019-04-29 04:54:30 -04:00
|
|
|
import {CommonJsReflectionHost} from '../../src/host/commonjs_host';
|
|
|
|
import {Esm2015ReflectionHost} from '../../src/host/esm2015_host';
|
|
|
|
import {getIifeBody} from '../../src/host/esm5_host';
|
|
|
|
import {MockLogger} from '../helpers/mock_logger';
|
2019-06-06 15:22:32 -04:00
|
|
|
import {getRootFiles, makeTestBundleProgram, makeTestDtsBundleProgram} from '../helpers/utils';
|
2019-04-29 04:54:30 -04:00
|
|
|
|
|
|
|
import {expectTypeValueReferencesForParameters} from './util';
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
runInEachFileSystem(() => {
|
|
|
|
describe('CommonJsReflectionHost', () => {
|
|
|
|
|
|
|
|
let _: typeof absoluteFrom;
|
|
|
|
|
|
|
|
let SOME_DIRECTIVE_FILE: TestFile;
|
|
|
|
let TOPLEVEL_DECORATORS_FILE: TestFile;
|
2019-05-23 17:40:17 -04:00
|
|
|
let CTOR_DECORATORS_ARRAY_FILE: TestFile;
|
2019-06-06 15:22:32 -04:00
|
|
|
let SIMPLE_ES2015_CLASS_FILE: TestFile;
|
|
|
|
let SIMPLE_CLASS_FILE: TestFile;
|
|
|
|
let FOO_FUNCTION_FILE: TestFile;
|
fix(ivy): in ngcc, handle inline exports in commonjs code (#32129)
One of the compiler's tasks is to enumerate the exports of a given ES
module. This can happen for example to resolve `foo.bar` where `foo` is a
namespace import:
```typescript
import * as foo from './foo';
@NgModule({
directives: [foo.DIRECTIVES],
})
```
In this case, the compiler must enumerate the exports of `foo.ts` in order
to evaluate the expression `foo.DIRECTIVES`.
When this operation occurs under ngcc, it must deal with the different
module formats and types of exports that occur. In commonjs code, a problem
arises when certain exports are downleveled.
```typescript
export const DIRECTIVES = [
FooDir,
BarDir,
];
```
can be downleveled to:
```javascript
exports.DIRECTIVES = [
FooDir,
BarDir,
```
Previously, ngtsc and ngcc expected that any export would have an associated
`ts.Declaration` node. `export class`, `export function`, etc. all retain
`ts.Declaration`s even when downleveled. But the `export const` construct
above does not. Therefore, ngcc would not detect `DIRECTIVES` as an export
of `foo.ts`, and the evaluation of `foo.DIRECTIVES` would therefore fail.
To solve this problem, the core concept of an exported `Declaration`
according to the `ReflectionHost` API is split into a `ConcreteDeclaration`
which has a `ts.Declaration`, and an `InlineDeclaration` which instead has
a `ts.Expression`. Differentiating between these allows ngcc to return an
`InlineDeclaration` for `DIRECTIVES` and correctly keep track of this
export.
PR Close #32129
2019-08-13 19:08:53 -04:00
|
|
|
let INLINE_EXPORT_FILE: TestFile;
|
2019-06-06 15:22:32 -04:00
|
|
|
let INVALID_DECORATORS_FILE: TestFile;
|
|
|
|
let INVALID_DECORATOR_ARGS_FILE: TestFile;
|
|
|
|
let INVALID_PROP_DECORATORS_FILE: TestFile;
|
|
|
|
let INVALID_PROP_DECORATOR_ARGS_FILE: TestFile;
|
|
|
|
let INVALID_CTOR_DECORATORS_FILE: TestFile;
|
|
|
|
let INVALID_CTOR_DECORATOR_ARGS_FILE: TestFile;
|
|
|
|
let IMPORTS_FILES: TestFile[];
|
|
|
|
let EXPORTS_FILES: TestFile[];
|
|
|
|
let FUNCTION_BODY_FILE: TestFile;
|
|
|
|
let DECORATED_FILES: TestFile[];
|
|
|
|
let TYPINGS_SRC_FILES: TestFile[];
|
|
|
|
let TYPINGS_DTS_FILES: TestFile[];
|
|
|
|
let MODULE_WITH_PROVIDERS_PROGRAM: TestFile[];
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
_ = absoluteFrom;
|
|
|
|
|
|
|
|
SOME_DIRECTIVE_FILE = {
|
|
|
|
name: _('/some_directive.cjs.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
|
|
|
|
var INJECTED_TOKEN = new InjectionToken('injected');
|
|
|
|
var ViewContainerRef = {};
|
|
|
|
var TemplateRef = {};
|
|
|
|
|
|
|
|
var SomeDirective = (function() {
|
|
|
|
function SomeDirective(_viewContainer, _template, injected) {
|
|
|
|
this.instanceProperty = 'instance';
|
|
|
|
}
|
|
|
|
SomeDirective.prototype = {
|
|
|
|
instanceMethod: function() {},
|
|
|
|
};
|
|
|
|
SomeDirective.staticMethod = function() {};
|
|
|
|
SomeDirective.staticProperty = 'static';
|
|
|
|
SomeDirective.decorators = [
|
|
|
|
{ type: core.Directive, args: [{ selector: '[someDirective]' },] }
|
|
|
|
];
|
|
|
|
SomeDirective.ctorParameters = function() { return [
|
|
|
|
{ type: ViewContainerRef, },
|
|
|
|
{ type: TemplateRef, },
|
|
|
|
{ type: undefined, decorators: [{ type: core.Inject, args: [INJECTED_TOKEN,] },] },
|
|
|
|
]; };
|
|
|
|
SomeDirective.propDecorators = {
|
|
|
|
"input1": [{ type: core.Input },],
|
|
|
|
"input2": [{ type: core.Input },],
|
|
|
|
};
|
|
|
|
return SomeDirective;
|
|
|
|
}());
|
|
|
|
exports.SomeDirective = SomeDirective;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
TOPLEVEL_DECORATORS_FILE = {
|
|
|
|
name: _('/toplevel_decorators.cjs.js'),
|
|
|
|
contents: `
|
2019-05-31 16:56:25 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
|
|
|
|
var INJECTED_TOKEN = new InjectionToken('injected');
|
|
|
|
var ViewContainerRef = {};
|
|
|
|
var TemplateRef = {};
|
|
|
|
|
|
|
|
var SomeDirective = (function() {
|
|
|
|
function SomeDirective(_viewContainer, _template, injected) {}
|
|
|
|
return SomeDirective;
|
|
|
|
}());
|
|
|
|
SomeDirective.decorators = [
|
|
|
|
{ type: core.Directive, args: [{ selector: '[someDirective]' },] }
|
|
|
|
];
|
|
|
|
SomeDirective.ctorParameters = function() { return [
|
|
|
|
{ type: ViewContainerRef, },
|
|
|
|
{ type: TemplateRef, },
|
|
|
|
{ type: undefined, decorators: [{ type: core.Inject, args: [INJECTED_TOKEN,] },] },
|
|
|
|
]; };
|
|
|
|
SomeDirective.propDecorators = {
|
|
|
|
"input1": [{ type: core.Input },],
|
|
|
|
"input2": [{ type: core.Input },],
|
|
|
|
};
|
|
|
|
exports.SomeDirective = SomeDirective;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-05-31 16:56:25 -04:00
|
|
|
|
2019-05-23 17:40:17 -04:00
|
|
|
CTOR_DECORATORS_ARRAY_FILE = {
|
|
|
|
name: _('/ctor_decorated_as_array.js'),
|
|
|
|
contents: `
|
|
|
|
var core = require('@angular/core');
|
|
|
|
var CtorDecoratedAsArray = (function() {
|
|
|
|
function CtorDecoratedAsArray(arg1) {
|
|
|
|
}
|
|
|
|
CtorDecoratedAsArray.ctorParameters = [{ type: ParamType, decorators: [{ type: Inject },] }];
|
|
|
|
return CtorDecoratedAsArray;
|
|
|
|
}());
|
|
|
|
exports.SomeDirective = SomeDirective;
|
|
|
|
`,
|
|
|
|
};
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
SIMPLE_ES2015_CLASS_FILE = {
|
|
|
|
name: _('/simple_es2015_class.d.ts'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
export class EmptyClass {}
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
SIMPLE_CLASS_FILE = {
|
|
|
|
name: _('/simple_class.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var EmptyClass = (function() {
|
|
|
|
function EmptyClass() {
|
|
|
|
}
|
|
|
|
return EmptyClass;
|
|
|
|
}());
|
|
|
|
var NoDecoratorConstructorClass = (function() {
|
|
|
|
function NoDecoratorConstructorClass(foo) {
|
|
|
|
}
|
|
|
|
return NoDecoratorConstructorClass;
|
|
|
|
}());
|
|
|
|
exports.EmptyClass = EmptyClass;
|
|
|
|
exports.NoDecoratorConstructorClass = NoDecoratorConstructorClass;
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
FOO_FUNCTION_FILE = {
|
|
|
|
name: _('/foo_function.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
function foo() {}
|
|
|
|
foo.decorators = [
|
|
|
|
{ type: core.Directive, args: [{ selector: '[ignored]' },] }
|
|
|
|
];
|
|
|
|
exports.foo = foo;
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
fix(ivy): in ngcc, handle inline exports in commonjs code (#32129)
One of the compiler's tasks is to enumerate the exports of a given ES
module. This can happen for example to resolve `foo.bar` where `foo` is a
namespace import:
```typescript
import * as foo from './foo';
@NgModule({
directives: [foo.DIRECTIVES],
})
```
In this case, the compiler must enumerate the exports of `foo.ts` in order
to evaluate the expression `foo.DIRECTIVES`.
When this operation occurs under ngcc, it must deal with the different
module formats and types of exports that occur. In commonjs code, a problem
arises when certain exports are downleveled.
```typescript
export const DIRECTIVES = [
FooDir,
BarDir,
];
```
can be downleveled to:
```javascript
exports.DIRECTIVES = [
FooDir,
BarDir,
```
Previously, ngtsc and ngcc expected that any export would have an associated
`ts.Declaration` node. `export class`, `export function`, etc. all retain
`ts.Declaration`s even when downleveled. But the `export const` construct
above does not. Therefore, ngcc would not detect `DIRECTIVES` as an export
of `foo.ts`, and the evaluation of `foo.DIRECTIVES` would therefore fail.
To solve this problem, the core concept of an exported `Declaration`
according to the `ReflectionHost` API is split into a `ConcreteDeclaration`
which has a `ts.Declaration`, and an `InlineDeclaration` which instead has
a `ts.Expression`. Differentiating between these allows ngcc to return an
`InlineDeclaration` for `DIRECTIVES` and correctly keep track of this
export.
PR Close #32129
2019-08-13 19:08:53 -04:00
|
|
|
INLINE_EXPORT_FILE = {
|
|
|
|
name: _('/inline_export.js'),
|
|
|
|
contents: `
|
|
|
|
var core = require('@angular/core');
|
|
|
|
function foo() {}
|
|
|
|
foo.decorators = [
|
|
|
|
{ type: core.Directive, args: [{ selector: '[ignored]' },] }
|
|
|
|
];
|
|
|
|
exports.directives = [foo];
|
|
|
|
`,
|
|
|
|
};
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
INVALID_DECORATORS_FILE = {
|
|
|
|
name: _('/invalid_decorators.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
var NotArrayLiteral = (function() {
|
|
|
|
function NotArrayLiteral() {
|
|
|
|
}
|
|
|
|
NotArrayLiteral.decorators = () => [
|
|
|
|
{ type: core.Directive, args: [{ selector: '[ignored]' },] },
|
|
|
|
];
|
|
|
|
return NotArrayLiteral;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotObjectLiteral = (function() {
|
|
|
|
function NotObjectLiteral() {
|
|
|
|
}
|
|
|
|
NotObjectLiteral.decorators = [
|
|
|
|
"This is not an object literal",
|
|
|
|
{ type: core.Directive },
|
|
|
|
];
|
|
|
|
return NotObjectLiteral;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NoTypeProperty = (function() {
|
|
|
|
function NoTypeProperty() {
|
|
|
|
}
|
|
|
|
NoTypeProperty.decorators = [
|
|
|
|
{ notType: core.Directive },
|
|
|
|
{ type: core.Directive },
|
|
|
|
];
|
|
|
|
return NoTypeProperty;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotIdentifier = (function() {
|
|
|
|
function NotIdentifier() {
|
|
|
|
}
|
|
|
|
NotIdentifier.decorators = [
|
|
|
|
{ type: 'StringsLiteralsAreNotIdentifiers' },
|
|
|
|
{ type: core.Directive },
|
|
|
|
];
|
|
|
|
return NotIdentifier;
|
|
|
|
}());
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
INVALID_DECORATOR_ARGS_FILE = {
|
|
|
|
name: _('/invalid_decorator_args.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
var NoArgsProperty = (function() {
|
|
|
|
function NoArgsProperty() {
|
|
|
|
}
|
|
|
|
NoArgsProperty.decorators = [
|
|
|
|
{ type: core.Directive },
|
|
|
|
];
|
|
|
|
return NoArgsProperty;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var args = [{ selector: '[ignored]' },];
|
|
|
|
var NoPropertyAssignment = (function() {
|
|
|
|
function NoPropertyAssignment() {
|
|
|
|
}
|
|
|
|
NoPropertyAssignment.decorators = [
|
|
|
|
{ type: core.Directive, args },
|
|
|
|
];
|
|
|
|
return NoPropertyAssignment;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotArrayLiteral = (function() {
|
|
|
|
function NotArrayLiteral() {
|
|
|
|
}
|
|
|
|
NotArrayLiteral.decorators = [
|
|
|
|
{ type: core.Directive, args: () => [{ selector: '[ignored]' },] },
|
|
|
|
];
|
|
|
|
return NotArrayLiteral;
|
|
|
|
}());
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
INVALID_PROP_DECORATORS_FILE = {
|
|
|
|
name: _('/invalid_prop_decorators.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
var NotObjectLiteral = (function() {
|
|
|
|
function NotObjectLiteral() {
|
|
|
|
}
|
|
|
|
NotObjectLiteral.propDecorators = () => ({
|
|
|
|
"prop": [{ type: core.Directive },]
|
|
|
|
});
|
|
|
|
return NotObjectLiteral;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotObjectLiteralProp = (function() {
|
|
|
|
function NotObjectLiteralProp() {
|
|
|
|
}
|
|
|
|
NotObjectLiteralProp.propDecorators = {
|
|
|
|
"prop": [
|
|
|
|
"This is not an object literal",
|
|
|
|
{ type: core.Directive },
|
|
|
|
]
|
|
|
|
};
|
|
|
|
return NotObjectLiteralProp;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NoTypeProperty = (function() {
|
|
|
|
function NoTypeProperty() {
|
|
|
|
}
|
|
|
|
NoTypeProperty.propDecorators = {
|
|
|
|
"prop": [
|
|
|
|
{ notType: core.Directive },
|
|
|
|
{ type: core.Directive },
|
|
|
|
]
|
|
|
|
};
|
|
|
|
return NoTypeProperty;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotIdentifier = (function() {
|
|
|
|
function NotIdentifier() {
|
|
|
|
}
|
|
|
|
NotIdentifier.propDecorators = {
|
|
|
|
"prop": [
|
|
|
|
{ type: 'StringsLiteralsAreNotIdentifiers' },
|
|
|
|
{ type: core.Directive },
|
|
|
|
]
|
|
|
|
};
|
|
|
|
return NotIdentifier;
|
|
|
|
}());
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
INVALID_PROP_DECORATOR_ARGS_FILE = {
|
|
|
|
name: _('/invalid_prop_decorator_args.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
var NoArgsProperty = (function() {
|
|
|
|
function NoArgsProperty() {
|
|
|
|
}
|
|
|
|
NoArgsProperty.propDecorators = {
|
|
|
|
"prop": [{ type: core.Input },]
|
|
|
|
};
|
|
|
|
return NoArgsProperty;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var args = [{ selector: '[ignored]' },];
|
|
|
|
var NoPropertyAssignment = (function() {
|
|
|
|
function NoPropertyAssignment() {
|
|
|
|
}
|
|
|
|
NoPropertyAssignment.propDecorators = {
|
|
|
|
"prop": [{ type: core.Input, args },]
|
|
|
|
};
|
|
|
|
return NoPropertyAssignment;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotArrayLiteral = (function() {
|
|
|
|
function NotArrayLiteral() {
|
|
|
|
}
|
|
|
|
NotArrayLiteral.propDecorators = {
|
|
|
|
"prop": [{ type: core.Input, args: () => [{ selector: '[ignored]' },] },],
|
|
|
|
};
|
|
|
|
return NotArrayLiteral;
|
|
|
|
}());
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
INVALID_CTOR_DECORATORS_FILE = {
|
|
|
|
name: _('/invalid_ctor_decorators.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
var NoParameters = (function() {
|
|
|
|
function NoParameters() {}
|
|
|
|
return NoParameters;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var ArrowFunction = (function() {
|
|
|
|
function ArrowFunction(arg1) {
|
|
|
|
}
|
|
|
|
ArrowFunction.ctorParameters = () => [
|
|
|
|
{ type: 'ParamType', decorators: [{ type: core.Inject },] }
|
|
|
|
];
|
|
|
|
return ArrowFunction;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotArrayLiteral = (function() {
|
|
|
|
function NotArrayLiteral(arg1) {
|
|
|
|
}
|
|
|
|
NotArrayLiteral.ctorParameters = function() { return 'StringsAreNotArrayLiterals'; };
|
|
|
|
return NotArrayLiteral;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotObjectLiteral = (function() {
|
|
|
|
function NotObjectLiteral(arg1, arg2) {
|
|
|
|
}
|
|
|
|
NotObjectLiteral.ctorParameters = function() { return [
|
|
|
|
"This is not an object literal",
|
|
|
|
{ type: 'ParamType', decorators: [{ type: core.Inject },] },
|
|
|
|
]; };
|
|
|
|
return NotObjectLiteral;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NoTypeProperty = (function() {
|
|
|
|
function NoTypeProperty(arg1, arg2) {
|
|
|
|
}
|
|
|
|
NoTypeProperty.ctorParameters = function() { return [
|
|
|
|
{
|
|
|
|
type: 'ParamType',
|
|
|
|
decorators: [
|
|
|
|
{ notType: core.Inject },
|
|
|
|
{ type: core.Inject },
|
|
|
|
]
|
|
|
|
},
|
|
|
|
]; };
|
|
|
|
return NoTypeProperty;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotIdentifier = (function() {
|
|
|
|
function NotIdentifier(arg1, arg2) {
|
|
|
|
}
|
|
|
|
NotIdentifier.ctorParameters = function() { return [
|
|
|
|
{
|
|
|
|
type: 'ParamType',
|
|
|
|
decorators: [
|
|
|
|
{ type: 'StringsLiteralsAreNotIdentifiers' },
|
|
|
|
{ type: core.Inject },
|
|
|
|
]
|
|
|
|
},
|
|
|
|
]; };
|
|
|
|
return NotIdentifier;
|
|
|
|
}());
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
INVALID_CTOR_DECORATOR_ARGS_FILE = {
|
|
|
|
name: _('/invalid_ctor_decorator_args.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
var NoArgsProperty = (function() {
|
|
|
|
function NoArgsProperty(arg1) {
|
|
|
|
}
|
|
|
|
NoArgsProperty.ctorParameters = function() { return [
|
|
|
|
{ type: 'ParamType', decorators: [{ type: core.Inject },] },
|
|
|
|
]; };
|
|
|
|
return NoArgsProperty;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var args = [{ selector: '[ignored]' },];
|
|
|
|
var NoPropertyAssignment = (function() {
|
|
|
|
function NoPropertyAssignment(arg1) {
|
|
|
|
}
|
|
|
|
NoPropertyAssignment.ctorParameters = function() { return [
|
|
|
|
{ type: 'ParamType', decorators: [{ type: core.Inject, args },] },
|
|
|
|
]; };
|
|
|
|
return NoPropertyAssignment;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var NotArrayLiteral = (function() {
|
|
|
|
function NotArrayLiteral(arg1) {
|
|
|
|
}
|
|
|
|
NotArrayLiteral.ctorParameters = function() { return [
|
|
|
|
{ type: 'ParamType', decorators: [{ type: core.Inject, args: () => [{ selector: '[ignored]' },] },] },
|
|
|
|
]; };
|
|
|
|
return NotArrayLiteral;
|
|
|
|
}());
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
IMPORTS_FILES = [
|
|
|
|
{
|
|
|
|
name: _('/index.js'),
|
|
|
|
contents: `
|
|
|
|
var file_a = require('./file_a');
|
|
|
|
var file_b = require('./file_b');
|
|
|
|
var file_c = require('./file_c');
|
|
|
|
`
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/file_a.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var a = 'a';
|
|
|
|
exports.a = a;
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/file_b.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var file_a = require('./file_a');
|
|
|
|
var b = file_a.a;
|
|
|
|
var c = 'c';
|
|
|
|
var d = c;
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/file_c.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var file_a = require('./file_a');
|
|
|
|
var c = file_a.a;
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
];
|
|
|
|
|
|
|
|
EXPORTS_FILES = [
|
|
|
|
{
|
|
|
|
name: _('/index.js'),
|
|
|
|
contents: `
|
|
|
|
var a_module = require('./a_module');
|
|
|
|
var b_module = require('./b_module');
|
|
|
|
var xtra_module = require('./xtra_module');
|
|
|
|
var wildcard_reexports = require('./wildcard_reexports');
|
|
|
|
`
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/a_module.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var a = 'a';
|
|
|
|
exports.a = a;
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/b_module.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
2019-06-06 15:22:32 -04:00
|
|
|
var a_module = require('./a_module');
|
2019-04-29 04:54:30 -04:00
|
|
|
var b = a_module.a;
|
|
|
|
var e = 'e';
|
|
|
|
var SomeClass = (function() {
|
|
|
|
function SomeClass() {}
|
|
|
|
return SomeClass;
|
|
|
|
}());
|
|
|
|
|
|
|
|
exports.Directive = core.Directive;
|
|
|
|
exports.a = a_module.a;
|
|
|
|
exports.b = b;
|
|
|
|
exports.c = a_module.a;
|
|
|
|
exports.d = b;
|
|
|
|
exports.e = e;
|
|
|
|
exports.DirectiveX = core.Directive;
|
|
|
|
exports.SomeClass = SomeClass;
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/xtra_module.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var xtra1 = 'xtra1';
|
|
|
|
var xtra2 = 'xtra2';
|
|
|
|
exports.xtra1 = xtra1;
|
|
|
|
exports.xtra2 = xtra2;
|
|
|
|
`,
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/wildcard_reexports.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
function __export(m) {
|
|
|
|
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
|
|
|
|
}
|
|
|
|
__export(require("./b_module"));
|
|
|
|
__export(require("./xtra_module"));
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
];
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
FUNCTION_BODY_FILE = {
|
|
|
|
name: _('/function_body.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
function foo(x) {
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
function bar(x, y) {
|
|
|
|
if (y === void 0) { y = 42; }
|
|
|
|
return x + y;
|
|
|
|
}
|
|
|
|
function complex() {
|
|
|
|
var x = 42;
|
|
|
|
return 42;
|
|
|
|
}
|
|
|
|
function baz(x) {
|
|
|
|
var y;
|
|
|
|
if (x === void 0) { y = 42; }
|
|
|
|
return y;
|
|
|
|
}
|
|
|
|
var y;
|
|
|
|
function qux(x) {
|
|
|
|
if (x === void 0) { y = 42; }
|
|
|
|
return y;
|
|
|
|
}
|
|
|
|
function moo() {
|
|
|
|
var x;
|
|
|
|
if (x === void 0) { x = 42; }
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
var x;
|
|
|
|
function juu() {
|
|
|
|
if (x === void 0) { x = 42; }
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
};
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
DECORATED_FILES = [
|
|
|
|
{
|
|
|
|
name: _('/primary.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
var secondary = require('./secondary');
|
|
|
|
var A = (function() {
|
|
|
|
function A() {}
|
|
|
|
A.decorators = [
|
|
|
|
{ type: core.Directive, args: [{ selector: '[a]' }] }
|
|
|
|
];
|
|
|
|
return A;
|
|
|
|
}());
|
|
|
|
var B = (function() {
|
|
|
|
function B() {}
|
|
|
|
B.decorators = [
|
|
|
|
{ type: core.Directive, args: [{ selector: '[b]' }] }
|
|
|
|
];
|
|
|
|
return B;
|
|
|
|
}());
|
|
|
|
function x() {}
|
|
|
|
function y() {}
|
|
|
|
var C = (function() {
|
|
|
|
function C() {}
|
|
|
|
return C;
|
|
|
|
});
|
|
|
|
exports.A = A;
|
|
|
|
exports.x = x;
|
|
|
|
exports.C = C;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/secondary.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var core = require('@angular/core');
|
|
|
|
var D = (function() {
|
|
|
|
function D() {}
|
|
|
|
D.decorators = [
|
|
|
|
{ type: core.Directive, args: [{ selector: '[d]' }] }
|
|
|
|
];
|
|
|
|
return D;
|
|
|
|
}());
|
|
|
|
exports.D = D;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
}
|
|
|
|
];
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
TYPINGS_SRC_FILES = [
|
|
|
|
{
|
|
|
|
name: _('/src/index.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var internal = require('./internal');
|
|
|
|
var class1 = require('./class1');
|
|
|
|
var class2 = require('./class2');
|
2019-06-06 15:22:32 -04:00
|
|
|
var missing = require('./missing-class');
|
|
|
|
var flatFile = require('./flat-file');
|
|
|
|
var func1 = require('./func1');
|
2019-04-29 04:54:30 -04:00
|
|
|
function __export(m) {
|
|
|
|
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
|
|
|
|
}
|
|
|
|
var InternalClass = internal.InternalClass;
|
|
|
|
__export(class1);
|
|
|
|
__export(class2);
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/src/class1.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var Class1 = (function() {
|
|
|
|
function Class1() {}
|
|
|
|
return Class1;
|
|
|
|
}());
|
|
|
|
var MissingClass1 = (function() {
|
|
|
|
function MissingClass1() {}
|
|
|
|
return MissingClass1;
|
|
|
|
}());
|
|
|
|
exports.Class1 = Class1;
|
|
|
|
exports.MissingClass1 = MissingClass1;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/src/class2.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var Class2 = (function() {
|
|
|
|
function Class2() {}
|
|
|
|
return Class2;
|
|
|
|
}());
|
|
|
|
exports.Class2 = Class2;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{name: _('/src/func1.js'), contents: 'function mooFn() {} export {mooFn}'}, {
|
|
|
|
name: _('/src/internal.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var InternalClass = (function() {
|
|
|
|
function InternalClass() {}
|
|
|
|
return InternalClass;
|
|
|
|
}());
|
|
|
|
var Class2 = (function() {
|
|
|
|
function Class2() {}
|
|
|
|
return Class2;
|
|
|
|
}());
|
|
|
|
exports.InternalClass =InternalClass;
|
|
|
|
exports.Class2 = Class2;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/src/missing-class.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var MissingClass2 = (function() {
|
|
|
|
function MissingClass2() {}
|
|
|
|
return MissingClass2;
|
|
|
|
}());
|
|
|
|
exports. MissingClass2 = MissingClass2;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/src/flat-file.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var Class1 = (function() {
|
|
|
|
function Class1() {}
|
|
|
|
return Class1;
|
|
|
|
}());
|
|
|
|
var MissingClass1 = (function() {
|
|
|
|
function MissingClass1() {}
|
|
|
|
return MissingClass1;
|
|
|
|
}());
|
|
|
|
var MissingClass2 = (function() {
|
|
|
|
function MissingClass2() {}
|
|
|
|
return MissingClass2;
|
|
|
|
}());
|
|
|
|
var Class3 = (function() {
|
|
|
|
function Class3() {}
|
|
|
|
return Class3;
|
|
|
|
}());
|
|
|
|
exports.Class1 = Class1;
|
|
|
|
exports.xClass3 = Class3;
|
|
|
|
exports.MissingClass1 = MissingClass1;
|
|
|
|
exports.MissingClass2 = MissingClass2;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
}
|
|
|
|
];
|
|
|
|
|
|
|
|
TYPINGS_DTS_FILES = [
|
|
|
|
{
|
|
|
|
name: _('/typings/index.d.ts'),
|
|
|
|
contents: `
|
|
|
|
import {InternalClass} from './internal';
|
|
|
|
import {mooFn} from './func1';
|
|
|
|
export * from './class1';
|
|
|
|
export * from './class2';
|
|
|
|
`
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/typings/class1.d.ts'),
|
|
|
|
contents: `export declare class Class1 {}\nexport declare class OtherClass {}`
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/typings/class2.d.ts'),
|
|
|
|
contents:
|
|
|
|
`export declare class Class2 {}\nexport declare interface SomeInterface {}\nexport {Class3 as xClass3} from './class3';`
|
|
|
|
},
|
|
|
|
{name: _('/typings/func1.d.ts'), contents: 'export declare function mooFn(): void;'},
|
|
|
|
{
|
|
|
|
name: _('/typings/internal.d.ts'),
|
|
|
|
contents: `export declare class InternalClass {}\nexport declare class Class2 {}`
|
|
|
|
},
|
|
|
|
{name: _('/typings/class3.d.ts'), contents: `export declare class Class3 {}`},
|
|
|
|
];
|
|
|
|
|
|
|
|
MODULE_WITH_PROVIDERS_PROGRAM = [
|
|
|
|
{
|
|
|
|
name: _('/src/index.js'),
|
|
|
|
contents: `
|
|
|
|
var functions = require('./functions');
|
|
|
|
var methods = require('./methods');
|
|
|
|
var aliased_class = require('./aliased_class');
|
|
|
|
`
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/src/functions.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var mod = require('./module');
|
|
|
|
var SomeService = (function() {
|
|
|
|
function SomeService() {}
|
|
|
|
return SomeService;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var InternalModule = (function() {
|
|
|
|
function InternalModule() {}
|
|
|
|
return InternalModule;
|
|
|
|
}());
|
|
|
|
|
|
|
|
function aNumber() { return 42; }
|
|
|
|
function aString() { return 'foo'; }
|
|
|
|
function emptyObject() { return {}; }
|
|
|
|
function ngModuleIdentifier() { return { ngModule: InternalModule }; }
|
|
|
|
function ngModuleWithEmptyProviders() { return { ngModule: InternalModule, providers: [] }; }
|
|
|
|
function ngModuleWithProviders() { return { ngModule: InternalModule, providers: [SomeService] }; }
|
|
|
|
function onlyProviders() { return { providers: [SomeService] }; }
|
|
|
|
function ngModuleNumber() { return { ngModule: 42 }; }
|
|
|
|
function ngModuleString() { return { ngModule: 'foo' }; }
|
|
|
|
function ngModuleObject() { return { ngModule: { foo: 42 } }; }
|
|
|
|
function externalNgModule() { return { ngModule: mod.ExternalModule }; }
|
|
|
|
// NOTE: We do not include the "namespaced" export tests in CommonJS as all CommonJS exports are already namespaced.
|
|
|
|
// function namespacedExternalNgModule() { return { ngModule: mod.ExternalModule }; }
|
|
|
|
|
|
|
|
exports.aNumber = aNumber;
|
|
|
|
exports.aString = aString;
|
|
|
|
exports.emptyObject = emptyObject;
|
|
|
|
exports.ngModuleIdentifier = ngModuleIdentifier;
|
|
|
|
exports.ngModuleWithEmptyProviders = ngModuleWithEmptyProviders;
|
|
|
|
exports.ngModuleWithProviders = ngModuleWithProviders;
|
|
|
|
exports.onlyProviders = onlyProviders;
|
|
|
|
exports.ngModuleNumber = ngModuleNumber;
|
|
|
|
exports.ngModuleString = ngModuleString;
|
|
|
|
exports.ngModuleObject = ngModuleObject;
|
|
|
|
exports.externalNgModule = externalNgModule;
|
|
|
|
exports.SomeService = SomeService;
|
|
|
|
exports.InternalModule = InternalModule;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/src/methods.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var mod = require('./module');
|
|
|
|
var SomeService = (function() {
|
|
|
|
function SomeService() {}
|
|
|
|
return SomeService;
|
|
|
|
}());
|
|
|
|
|
|
|
|
var InternalModule = (function() {
|
|
|
|
function InternalModule() {}
|
|
|
|
InternalModule.prototype = {
|
|
|
|
instanceNgModuleIdentifier: function() { return { ngModule: InternalModule }; },
|
|
|
|
instanceNgModuleWithEmptyProviders: function() { return { ngModule: InternalModule, providers: [] }; },
|
|
|
|
instanceNgModuleWithProviders: function() { return { ngModule: InternalModule, providers: [SomeService] }; },
|
|
|
|
instanceExternalNgModule: function() { return { ngModule: mod.ExternalModule }; },
|
|
|
|
};
|
|
|
|
InternalModule.aNumber = function() { return 42; };
|
|
|
|
InternalModule.aString = function() { return 'foo'; };
|
|
|
|
InternalModule.emptyObject = function() { return {}; };
|
|
|
|
InternalModule.ngModuleIdentifier = function() { return { ngModule: InternalModule }; };
|
|
|
|
InternalModule.ngModuleWithEmptyProviders = function() { return { ngModule: InternalModule, providers: [] }; };
|
|
|
|
InternalModule.ngModuleWithProviders = function() { return { ngModule: InternalModule, providers: [SomeService] }; };
|
|
|
|
InternalModule.onlyProviders = function() { return { providers: [SomeService] }; };
|
|
|
|
InternalModule.ngModuleNumber = function() { return { ngModule: 42 }; };
|
|
|
|
InternalModule.ngModuleString = function() { return { ngModule: 'foo' }; };
|
|
|
|
InternalModule.ngModuleObject = function() { return { ngModule: { foo: 42 } }; };
|
|
|
|
InternalModule.externalNgModule = function() { return { ngModule: mod.ExternalModule }; };
|
|
|
|
return InternalModule;
|
|
|
|
}());
|
|
|
|
|
|
|
|
exports.SomeService = SomeService;
|
|
|
|
exports.InternalModule = InternalModule;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/src/aliased_class.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var AliasedModule = (function() {
|
|
|
|
function AliasedModule() {}
|
|
|
|
AliasedModule_1 = AliasedModule;
|
|
|
|
AliasedModule.forRoot = function() { return { ngModule: AliasedModule_1 }; };
|
|
|
|
var AliasedModule_1;
|
|
|
|
return AliasedModule;
|
|
|
|
}());
|
|
|
|
exports.AliasedModule = AliasedModule;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
{
|
|
|
|
name: _('/src/module.js'),
|
|
|
|
contents: `
|
2019-04-29 04:54:30 -04:00
|
|
|
var ExternalModule = (function() {
|
|
|
|
function ExternalModule() {}
|
|
|
|
return ExternalModule;
|
|
|
|
}());
|
|
|
|
exports.ExternalModule = ExternalModule;
|
|
|
|
`
|
2019-06-06 15:22:32 -04:00
|
|
|
},
|
|
|
|
];
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('CommonJsReflectionHost', () => {
|
|
|
|
|
|
|
|
describe('getDecoratorsOfDeclaration()', () => {
|
|
|
|
it('should find the decorators on a class', () => {
|
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
|
|
|
|
expect(decorators).toBeDefined();
|
|
|
|
expect(decorators.length).toEqual(1);
|
|
|
|
|
|
|
|
const decorator = decorators[0];
|
|
|
|
expect(decorator.name).toEqual('Directive');
|
|
|
|
expect(decorator.import).toEqual({name: 'Directive', from: '@angular/core'});
|
|
|
|
expect(decorator.args !.map(arg => arg.getText())).toEqual([
|
|
|
|
'{ selector: \'[someDirective]\' }',
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find the decorators on a class at the top level', () => {
|
|
|
|
loadTestFiles([TOPLEVEL_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(TOPLEVEL_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, TOPLEVEL_DECORATORS_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
|
|
|
|
expect(decorators).toBeDefined();
|
|
|
|
expect(decorators.length).toEqual(1);
|
|
|
|
|
|
|
|
const decorator = decorators[0];
|
|
|
|
expect(decorator.name).toEqual('Directive');
|
|
|
|
expect(decorator.import).toEqual({name: 'Directive', from: '@angular/core'});
|
|
|
|
expect(decorator.args !.map(arg => arg.getText())).toEqual([
|
|
|
|
'{ selector: \'[someDirective]\' }',
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return null if the symbol is not a class', () => {
|
|
|
|
loadTestFiles([FOO_FUNCTION_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const functionNode =
|
|
|
|
getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(functionNode);
|
|
|
|
expect(decorators).toBe(null);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return null if there are no decorators', () => {
|
|
|
|
loadTestFiles([SIMPLE_CLASS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode);
|
|
|
|
expect(decorators).toBe(null);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore `decorators` if it is not an array literal', () => {
|
|
|
|
loadTestFiles([INVALID_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_DECORATORS_FILE.name, 'NotArrayLiteral', isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode);
|
|
|
|
expect(decorators).toEqual([]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore decorator elements that are not object literals', () => {
|
|
|
|
loadTestFiles([INVALID_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_DECORATORS_FILE.name, 'NotObjectLiteral',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore decorator elements that have no `type` property', () => {
|
|
|
|
loadTestFiles([INVALID_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_DECORATORS_FILE.name, 'NoTypeProperty', isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore decorator elements whose `type` value is not an identifier', () => {
|
|
|
|
loadTestFiles([INVALID_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(INVALID_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_DECORATORS_FILE.name, 'NotIdentifier', isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('(returned decorators `args`)', () => {
|
|
|
|
it('should be an empty array if decorator has no `args` property', () => {
|
|
|
|
loadTestFiles([INVALID_DECORATOR_ARGS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_DECORATOR_ARGS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0].name).toBe('Directive');
|
|
|
|
expect(decorators[0].args).toEqual([]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should be an empty array if decorator\'s `args` has no property assignment', () => {
|
|
|
|
loadTestFiles([INVALID_DECORATOR_ARGS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_DECORATOR_ARGS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0].name).toBe('Directive');
|
|
|
|
expect(decorators[0].args).toEqual([]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should be an empty array if `args` property value is not an array literal', () => {
|
|
|
|
loadTestFiles([INVALID_DECORATOR_ARGS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_DECORATOR_ARGS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0].name).toBe('Directive');
|
|
|
|
expect(decorators[0].args).toEqual([]);
|
|
|
|
});
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getMembersOfClass()', () => {
|
|
|
|
it('should find decorated members on a class', () => {
|
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
|
|
|
|
const input1 = members.find(member => member.name === 'input1') !;
|
|
|
|
expect(input1.kind).toEqual(ClassMemberKind.Property);
|
|
|
|
expect(input1.isStatic).toEqual(false);
|
|
|
|
expect(input1.decorators !.map(d => d.name)).toEqual(['Input']);
|
|
|
|
|
|
|
|
const input2 = members.find(member => member.name === 'input2') !;
|
|
|
|
expect(input2.kind).toEqual(ClassMemberKind.Property);
|
|
|
|
expect(input2.isStatic).toEqual(false);
|
|
|
|
expect(input1.decorators !.map(d => d.name)).toEqual(['Input']);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find decorated members on a class at the top level', () => {
|
|
|
|
loadTestFiles([TOPLEVEL_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(TOPLEVEL_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, TOPLEVEL_DECORATORS_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
|
|
|
|
const input1 = members.find(member => member.name === 'input1') !;
|
|
|
|
expect(input1.kind).toEqual(ClassMemberKind.Property);
|
|
|
|
expect(input1.isStatic).toEqual(false);
|
|
|
|
expect(input1.decorators !.map(d => d.name)).toEqual(['Input']);
|
|
|
|
|
|
|
|
const input2 = members.find(member => member.name === 'input2') !;
|
|
|
|
expect(input2.kind).toEqual(ClassMemberKind.Property);
|
|
|
|
expect(input2.isStatic).toEqual(false);
|
|
|
|
expect(input1.decorators !.map(d => d.name)).toEqual(['Input']);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find non decorated properties on a class', () => {
|
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
|
|
|
|
const instanceProperty = members.find(member => member.name === 'instanceProperty') !;
|
|
|
|
expect(instanceProperty.kind).toEqual(ClassMemberKind.Property);
|
|
|
|
expect(instanceProperty.isStatic).toEqual(false);
|
|
|
|
expect(ts.isBinaryExpression(instanceProperty.implementation !)).toEqual(true);
|
|
|
|
expect(instanceProperty.value !.getText()).toEqual(`'instance'`);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find static methods on a class', () => {
|
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
|
|
|
|
const staticMethod = members.find(member => member.name === 'staticMethod') !;
|
|
|
|
expect(staticMethod.kind).toEqual(ClassMemberKind.Method);
|
|
|
|
expect(staticMethod.isStatic).toEqual(true);
|
|
|
|
expect(ts.isFunctionExpression(staticMethod.implementation !)).toEqual(true);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find static properties on a class', () => {
|
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
|
|
|
|
const staticProperty = members.find(member => member.name === 'staticProperty') !;
|
|
|
|
expect(staticProperty.kind).toEqual(ClassMemberKind.Property);
|
|
|
|
expect(staticProperty.isStatic).toEqual(true);
|
|
|
|
expect(ts.isPropertyAccessExpression(staticProperty.implementation !)).toEqual(true);
|
|
|
|
expect(staticProperty.value !.getText()).toEqual(`'static'`);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should throw if the symbol is not a class', () => {
|
|
|
|
loadTestFiles([FOO_FUNCTION_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const functionNode =
|
|
|
|
getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
|
|
|
|
expect(() => {
|
|
|
|
host.getMembersOfClass(functionNode);
|
|
|
|
}).toThrowError(`Attempted to get members of a non-class: "function foo() {}"`);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return an empty array if there are no prop decorators', () => {
|
|
|
|
loadTestFiles([SIMPLE_CLASS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
|
|
|
|
expect(members).toEqual([]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should not process decorated properties in `propDecorators` if it is not an object literal',
|
|
|
|
() => {
|
|
|
|
loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteral',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
|
|
|
|
expect(members.map(member => member.name)).not.toContain('prop');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore prop decorator elements that are not object literals', () => {
|
|
|
|
loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_PROP_DECORATORS_FILE.name, 'NotObjectLiteralProp',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
const prop = members.find(m => m.name === 'prop') !;
|
|
|
|
const decorators = prop.decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore prop decorator elements that have no `type` property', () => {
|
|
|
|
loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_PROP_DECORATORS_FILE.name, 'NoTypeProperty',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
const prop = members.find(m => m.name === 'prop') !;
|
|
|
|
const decorators = prop.decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore prop decorator elements whose `type` value is not an identifier', () => {
|
|
|
|
loadTestFiles([INVALID_PROP_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_PROP_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_PROP_DECORATORS_FILE.name, 'NotIdentifier',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
const prop = members.find(m => m.name === 'prop') !;
|
|
|
|
const decorators = prop.decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Directive'}));
|
|
|
|
});
|
|
|
|
|
refactor(ivy): ngcc - categorize the various decorate calls upfront (#31614)
Any decorator information present in TypeScript is emitted into the
generated JavaScript sources by means of `__decorate` call. This call
contains both the decorators as they existed in the original source
code, together with calls to `tslib` helpers that convey additional
information on e.g. type information and parameter decorators. These
different kinds of decorator calls were not previously distinguished on
their own, but instead all treated as `Decorator` by themselves. The
"decorators" that were actually `tslib` helper calls were conveniently
filtered out because they were not imported from `@angular/core`, a
characteristic that ngcc uses to drop certain decorators.
Note that this posed an inconsistency in ngcc when it processes
`@angular/core`'s UMD bundle, as the `tslib` helper functions have been
inlined in said bundle. Because of the inlining, the `tslib` helpers
appear to be from `@angular/core`, so ngcc would fail to drop those
apparent "decorators". This inconsistency does not currently cause any
issues, as ngtsc is specifically looking for decorators based on their
name and any remaining decorators are simply ignored.
This commit rewrites the decorator analysis of a class to occur all in a
single phase, instead of all throughout the `ReflectionHost`. This
allows to categorize the various decorate calls in a single sweep,
instead of constantly needing to filter out undesired decorate calls on
the go. As an added benefit, the computed decorator information is now
cached per class, such that subsequent reflection queries that need
decorator information can reuse the cached info.
PR Close #31614
2019-07-19 17:17:22 -04:00
|
|
|
it('should have import information on decorators', () => {
|
2019-06-06 15:22:32 -04:00
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const decorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
|
|
|
|
expect(decorators.length).toEqual(1);
|
refactor(ivy): ngcc - categorize the various decorate calls upfront (#31614)
Any decorator information present in TypeScript is emitted into the
generated JavaScript sources by means of `__decorate` call. This call
contains both the decorators as they existed in the original source
code, together with calls to `tslib` helpers that convey additional
information on e.g. type information and parameter decorators. These
different kinds of decorator calls were not previously distinguished on
their own, but instead all treated as `Decorator` by themselves. The
"decorators" that were actually `tslib` helper calls were conveniently
filtered out because they were not imported from `@angular/core`, a
characteristic that ngcc uses to drop certain decorators.
Note that this posed an inconsistency in ngcc when it processes
`@angular/core`'s UMD bundle, as the `tslib` helper functions have been
inlined in said bundle. Because of the inlining, the `tslib` helpers
appear to be from `@angular/core`, so ngcc would fail to drop those
apparent "decorators". This inconsistency does not currently cause any
issues, as ngtsc is specifically looking for decorators based on their
name and any remaining decorators are simply ignored.
This commit rewrites the decorator analysis of a class to occur all in a
single phase, instead of all throughout the `ReflectionHost`. This
allows to categorize the various decorate calls in a single sweep,
instead of constantly needing to filter out undesired decorate calls on
the go. As an added benefit, the computed decorator information is now
cached per class, such that subsequent reflection queries that need
decorator information can reuse the cached info.
PR Close #31614
2019-07-19 17:17:22 -04:00
|
|
|
expect(decorators[0].import).toEqual({name: 'Directive', from: '@angular/core'});
|
2019-06-06 15:22:32 -04:00
|
|
|
});
|
|
|
|
|
|
|
|
describe('(returned prop decorators `args`)', () => {
|
|
|
|
it('should be an empty array if prop decorator has no `args` property', () => {
|
|
|
|
loadTestFiles([INVALID_PROP_DECORATOR_ARGS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_PROP_DECORATOR_ARGS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
const prop = members.find(m => m.name === 'prop') !;
|
|
|
|
const decorators = prop.decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0].name).toBe('Input');
|
|
|
|
expect(decorators[0].args).toEqual([]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should be an empty array if prop decorator\'s `args` has no property assignment',
|
|
|
|
() => {
|
|
|
|
loadTestFiles([INVALID_PROP_DECORATOR_ARGS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_PROP_DECORATOR_ARGS_FILE.name);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
const prop = members.find(m => m.name === 'prop') !;
|
|
|
|
const decorators = prop.decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0].name).toBe('Input');
|
|
|
|
expect(decorators[0].args).toEqual([]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should be an empty array if `args` property value is not an array literal', () => {
|
|
|
|
loadTestFiles([INVALID_PROP_DECORATOR_ARGS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_PROP_DECORATOR_ARGS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_PROP_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const members = host.getMembersOfClass(classNode);
|
|
|
|
const prop = members.find(m => m.name === 'prop') !;
|
|
|
|
const decorators = prop.decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0].name).toBe('Input');
|
|
|
|
expect(decorators[0].args).toEqual([]);
|
|
|
|
});
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getConstructorParameters', () => {
|
|
|
|
it('should find the decorated constructor parameters', () => {
|
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
|
|
|
|
expect(parameters).toBeDefined();
|
|
|
|
expect(parameters !.map(parameter => parameter.name)).toEqual([
|
|
|
|
'_viewContainer', '_template', 'injected'
|
|
|
|
]);
|
|
|
|
expectTypeValueReferencesForParameters(parameters !, [
|
|
|
|
'ViewContainerRef',
|
|
|
|
'TemplateRef',
|
|
|
|
null,
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find the decorated constructor parameters at the top level', () => {
|
|
|
|
loadTestFiles([TOPLEVEL_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(TOPLEVEL_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, TOPLEVEL_DECORATORS_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
|
|
|
|
expect(parameters).toBeDefined();
|
|
|
|
expect(parameters !.map(parameter => parameter.name)).toEqual([
|
|
|
|
'_viewContainer', '_template', 'injected'
|
|
|
|
]);
|
|
|
|
expectTypeValueReferencesForParameters(parameters !, [
|
|
|
|
'ViewContainerRef',
|
|
|
|
'TemplateRef',
|
|
|
|
null,
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
2019-05-23 17:40:17 -04:00
|
|
|
it('should accept `ctorParameters` as an array', () => {
|
|
|
|
loadTestFiles([CTOR_DECORATORS_ARRAY_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(CTOR_DECORATORS_ARRAY_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, CTOR_DECORATORS_ARRAY_FILE.name, 'CtorDecoratedAsArray',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode) !;
|
|
|
|
|
|
|
|
expect(parameters).toBeDefined();
|
|
|
|
expect(parameters.map(parameter => parameter.name)).toEqual(['arg1']);
|
|
|
|
expectTypeValueReferencesForParameters(parameters, ['ParamType']);
|
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
it('should throw if the symbol is not a class', () => {
|
|
|
|
loadTestFiles([FOO_FUNCTION_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const functionNode =
|
|
|
|
getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
|
|
|
|
expect(() => { host.getConstructorParameters(functionNode); })
|
|
|
|
.toThrowError(
|
|
|
|
'Attempted to get constructor parameters of a non-class: "function foo() {}"');
|
|
|
|
});
|
|
|
|
|
|
|
|
// In ES5 there is no such thing as a constructor-less class
|
|
|
|
// it('should return `null` if there is no constructor', () => { });
|
|
|
|
|
|
|
|
it('should return an array even if there are no decorators', () => {
|
|
|
|
loadTestFiles([SIMPLE_CLASS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SIMPLE_CLASS_FILE.name, 'NoDecoratorConstructorClass',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
|
|
|
|
expect(parameters).toEqual(jasmine.any(Array));
|
|
|
|
expect(parameters !.length).toEqual(1);
|
|
|
|
expect(parameters ![0].name).toEqual('foo');
|
|
|
|
expect(parameters ![0].decorators).toBe(null);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return an empty array if there are no constructor parameters', () => {
|
|
|
|
loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_CTOR_DECORATORS_FILE.name, 'NoParameters',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
|
|
|
|
expect(parameters).toEqual([]);
|
|
|
|
});
|
|
|
|
|
|
|
|
// In ES5 there are no arrow functions
|
|
|
|
// it('should ignore `ctorParameters` if it is an arrow function', () => { });
|
|
|
|
|
|
|
|
it('should ignore `ctorParameters` if it does not return an array literal', () => {
|
|
|
|
loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_CTOR_DECORATORS_FILE.name, 'NotArrayLiteral',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
|
|
|
|
expect(parameters !.length).toBe(1);
|
|
|
|
expect(parameters ![0]).toEqual(jasmine.objectContaining<CtorParameter>({
|
|
|
|
name: 'arg1',
|
|
|
|
decorators: null,
|
|
|
|
}));
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('(returned parameters `decorators`)', () => {
|
|
|
|
it('should ignore param decorator elements that are not object literals', () => {
|
|
|
|
loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_CTOR_DECORATORS_FILE.name, 'NotObjectLiteral',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
|
|
|
|
expect(parameters !.length).toBe(2);
|
|
|
|
expect(parameters ![0]).toEqual(jasmine.objectContaining<CtorParameter>({
|
|
|
|
name: 'arg1',
|
|
|
|
decorators: null,
|
|
|
|
}));
|
|
|
|
expect(parameters ![1]).toEqual(jasmine.objectContaining<CtorParameter>({
|
|
|
|
name: 'arg2',
|
|
|
|
decorators: jasmine.any(Array) as any
|
|
|
|
}));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore param decorator elements that have no `type` property', () => {
|
|
|
|
loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_CTOR_DECORATORS_FILE.name, 'NoTypeProperty',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
const decorators = parameters ![0].decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should ignore param decorator elements whose `type` value is not an identifier',
|
|
|
|
() => {
|
|
|
|
loadTestFiles([INVALID_CTOR_DECORATORS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_CTOR_DECORATORS_FILE.name);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_CTOR_DECORATORS_FILE.name, 'NotIdentifier',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
const decorators = parameters ![0].decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0]).toEqual(jasmine.objectContaining({name: 'Inject'}));
|
|
|
|
});
|
|
|
|
|
refactor(ivy): ngcc - categorize the various decorate calls upfront (#31614)
Any decorator information present in TypeScript is emitted into the
generated JavaScript sources by means of `__decorate` call. This call
contains both the decorators as they existed in the original source
code, together with calls to `tslib` helpers that convey additional
information on e.g. type information and parameter decorators. These
different kinds of decorator calls were not previously distinguished on
their own, but instead all treated as `Decorator` by themselves. The
"decorators" that were actually `tslib` helper calls were conveniently
filtered out because they were not imported from `@angular/core`, a
characteristic that ngcc uses to drop certain decorators.
Note that this posed an inconsistency in ngcc when it processes
`@angular/core`'s UMD bundle, as the `tslib` helper functions have been
inlined in said bundle. Because of the inlining, the `tslib` helpers
appear to be from `@angular/core`, so ngcc would fail to drop those
apparent "decorators". This inconsistency does not currently cause any
issues, as ngtsc is specifically looking for decorators based on their
name and any remaining decorators are simply ignored.
This commit rewrites the decorator analysis of a class to occur all in a
single phase, instead of all throughout the `ReflectionHost`. This
allows to categorize the various decorate calls in a single sweep,
instead of constantly needing to filter out undesired decorate calls on
the go. As an added benefit, the computed decorator information is now
cached per class, such that subsequent reflection queries that need
decorator information can reuse the cached info.
PR Close #31614
2019-07-19 17:17:22 -04:00
|
|
|
it('should have import information on decorators', () => {
|
2019-06-06 15:22:32 -04:00
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
const decorators = parameters ![2].decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toEqual(1);
|
refactor(ivy): ngcc - categorize the various decorate calls upfront (#31614)
Any decorator information present in TypeScript is emitted into the
generated JavaScript sources by means of `__decorate` call. This call
contains both the decorators as they existed in the original source
code, together with calls to `tslib` helpers that convey additional
information on e.g. type information and parameter decorators. These
different kinds of decorator calls were not previously distinguished on
their own, but instead all treated as `Decorator` by themselves. The
"decorators" that were actually `tslib` helper calls were conveniently
filtered out because they were not imported from `@angular/core`, a
characteristic that ngcc uses to drop certain decorators.
Note that this posed an inconsistency in ngcc when it processes
`@angular/core`'s UMD bundle, as the `tslib` helper functions have been
inlined in said bundle. Because of the inlining, the `tslib` helpers
appear to be from `@angular/core`, so ngcc would fail to drop those
apparent "decorators". This inconsistency does not currently cause any
issues, as ngtsc is specifically looking for decorators based on their
name and any remaining decorators are simply ignored.
This commit rewrites the decorator analysis of a class to occur all in a
single phase, instead of all throughout the `ReflectionHost`. This
allows to categorize the various decorate calls in a single sweep,
instead of constantly needing to filter out undesired decorate calls on
the go. As an added benefit, the computed decorator information is now
cached per class, such that subsequent reflection queries that need
decorator information can reuse the cached info.
PR Close #31614
2019-07-19 17:17:22 -04:00
|
|
|
expect(decorators[0].name).toBe('Inject');
|
|
|
|
expect(decorators[0].import).toEqual({name: 'Inject', from: '@angular/core'});
|
2019-06-06 15:22:32 -04:00
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('(returned parameters `decorators.args`)', () => {
|
|
|
|
it('should be an empty array if param decorator has no `args` property', () => {
|
|
|
|
loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_CTOR_DECORATOR_ARGS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoArgsProperty',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
expect(parameters !.length).toBe(1);
|
|
|
|
const decorators = parameters ![0].decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0].name).toBe('Inject');
|
|
|
|
expect(decorators[0].args).toEqual([]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should be an empty array if param decorator\'s `args` has no property assignment',
|
|
|
|
() => {
|
|
|
|
loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_CTOR_DECORATOR_ARGS_FILE.name);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NoPropertyAssignment',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
const decorators = parameters ![0].decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0].name).toBe('Inject');
|
|
|
|
expect(decorators[0].args).toEqual([]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should be an empty array if `args` property value is not an array literal', () => {
|
|
|
|
loadTestFiles([INVALID_CTOR_DECORATOR_ARGS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(INVALID_CTOR_DECORATOR_ARGS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, INVALID_CTOR_DECORATOR_ARGS_FILE.name, 'NotArrayLiteral',
|
|
|
|
isNamedVariableDeclaration);
|
|
|
|
const parameters = host.getConstructorParameters(classNode);
|
|
|
|
const decorators = parameters ![0].decorators !;
|
|
|
|
|
|
|
|
expect(decorators.length).toBe(1);
|
|
|
|
expect(decorators[0].name).toBe('Inject');
|
|
|
|
expect(decorators[0].args).toEqual([]);
|
|
|
|
});
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getDefinitionOfFunction()', () => {
|
|
|
|
it('should return an object describing the function declaration passed as an argument',
|
|
|
|
() => {
|
|
|
|
loadTestFiles([FUNCTION_BODY_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(FUNCTION_BODY_FILE.name);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
|
|
|
|
const fooNode = getDeclaration(
|
|
|
|
program, FUNCTION_BODY_FILE.name, 'foo', isNamedFunctionDeclaration) !;
|
|
|
|
const fooDef = host.getDefinitionOfFunction(fooNode) !;
|
|
|
|
expect(fooDef.node).toBe(fooNode);
|
|
|
|
expect(fooDef.body !.length).toEqual(1);
|
|
|
|
expect(fooDef.body ![0].getText()).toEqual(`return x;`);
|
|
|
|
expect(fooDef.parameters.length).toEqual(1);
|
|
|
|
expect(fooDef.parameters[0].name).toEqual('x');
|
|
|
|
expect(fooDef.parameters[0].initializer).toBe(null);
|
|
|
|
|
|
|
|
const barNode = getDeclaration(
|
|
|
|
program, FUNCTION_BODY_FILE.name, 'bar', isNamedFunctionDeclaration) !;
|
|
|
|
const barDef = host.getDefinitionOfFunction(barNode) !;
|
|
|
|
expect(barDef.node).toBe(barNode);
|
|
|
|
expect(barDef.body !.length).toEqual(1);
|
|
|
|
expect(ts.isReturnStatement(barDef.body ![0])).toBeTruthy();
|
|
|
|
expect(barDef.body ![0].getText()).toEqual(`return x + y;`);
|
|
|
|
expect(barDef.parameters.length).toEqual(2);
|
|
|
|
expect(barDef.parameters[0].name).toEqual('x');
|
|
|
|
expect(fooDef.parameters[0].initializer).toBe(null);
|
|
|
|
expect(barDef.parameters[1].name).toEqual('y');
|
|
|
|
expect(barDef.parameters[1].initializer !.getText()).toEqual('42');
|
|
|
|
|
|
|
|
const bazNode = getDeclaration(
|
|
|
|
program, FUNCTION_BODY_FILE.name, 'baz', isNamedFunctionDeclaration) !;
|
|
|
|
const bazDef = host.getDefinitionOfFunction(bazNode) !;
|
|
|
|
expect(bazDef.node).toBe(bazNode);
|
|
|
|
expect(bazDef.body !.length).toEqual(3);
|
|
|
|
expect(bazDef.parameters.length).toEqual(1);
|
|
|
|
expect(bazDef.parameters[0].name).toEqual('x');
|
|
|
|
expect(bazDef.parameters[0].initializer).toBe(null);
|
|
|
|
|
|
|
|
const quxNode = getDeclaration(
|
|
|
|
program, FUNCTION_BODY_FILE.name, 'qux', isNamedFunctionDeclaration) !;
|
|
|
|
const quxDef = host.getDefinitionOfFunction(quxNode) !;
|
|
|
|
expect(quxDef.node).toBe(quxNode);
|
|
|
|
expect(quxDef.body !.length).toEqual(2);
|
|
|
|
expect(quxDef.parameters.length).toEqual(1);
|
|
|
|
expect(quxDef.parameters[0].name).toEqual('x');
|
|
|
|
expect(quxDef.parameters[0].initializer).toBe(null);
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getImportOfIdentifier', () => {
|
|
|
|
it('should find the import of an identifier', () => {
|
|
|
|
loadTestFiles(IMPORTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/index.js'));
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const variableNode =
|
|
|
|
getDeclaration(program, _('/file_b.js'), 'b', isNamedVariableDeclaration);
|
|
|
|
const identifier = (variableNode.initializer &&
|
|
|
|
ts.isPropertyAccessExpression(variableNode.initializer)) ?
|
|
|
|
variableNode.initializer.name :
|
|
|
|
null;
|
|
|
|
|
|
|
|
expect(identifier).not.toBe(null);
|
|
|
|
const importOfIdent = host.getImportOfIdentifier(identifier !);
|
|
|
|
expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return null if the identifier was not imported', () => {
|
|
|
|
loadTestFiles(IMPORTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/index.js'));
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const variableNode =
|
|
|
|
getDeclaration(program, _('/file_b.js'), 'd', isNamedVariableDeclaration);
|
|
|
|
const importOfIdent =
|
|
|
|
host.getImportOfIdentifier(variableNode.initializer as ts.Identifier);
|
|
|
|
|
|
|
|
expect(importOfIdent).toBeNull();
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should handle factory functions not wrapped in parentheses', () => {
|
|
|
|
loadTestFiles(IMPORTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/index.js'));
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const variableNode =
|
|
|
|
getDeclaration(program, _('/file_c.js'), 'c', isNamedVariableDeclaration);
|
|
|
|
const identifier = (variableNode.initializer &&
|
|
|
|
ts.isPropertyAccessExpression(variableNode.initializer)) ?
|
|
|
|
variableNode.initializer.name :
|
|
|
|
null;
|
|
|
|
|
|
|
|
expect(identifier).not.toBe(null);
|
|
|
|
const importOfIdent = host.getImportOfIdentifier(identifier !);
|
|
|
|
expect(importOfIdent).toEqual({name: 'a', from: './file_a'});
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getDeclarationOfIdentifier', () => {
|
|
|
|
it('should return the declaration of a locally defined identifier', () => {
|
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const ctrDecorators = host.getConstructorParameters(classNode) !;
|
|
|
|
const identifierOfViewContainerRef = (ctrDecorators[0].typeValueReference !as{
|
|
|
|
local: true,
|
|
|
|
expression: ts.Identifier,
|
|
|
|
defaultImportStatement: null,
|
|
|
|
}).expression;
|
|
|
|
|
|
|
|
const expectedDeclarationNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'ViewContainerRef', isNamedVariableDeclaration);
|
|
|
|
const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfViewContainerRef);
|
|
|
|
expect(actualDeclaration).not.toBe(null);
|
|
|
|
expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
|
|
|
|
expect(actualDeclaration !.viaModule).toBe(null);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return the source-file of an import namespace', () => {
|
|
|
|
loadFakeCore(getFileSystem());
|
|
|
|
loadTestFiles([SOME_DIRECTIVE_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SOME_DIRECTIVE_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode = getDeclaration(
|
|
|
|
program, SOME_DIRECTIVE_FILE.name, 'SomeDirective', isNamedVariableDeclaration);
|
|
|
|
const classDecorators = host.getDecoratorsOfDeclaration(classNode) !;
|
|
|
|
const identifierOfDirective = (((classDecorators[0].node as ts.ObjectLiteralExpression)
|
|
|
|
.properties[0] as ts.PropertyAssignment)
|
|
|
|
.initializer as ts.PropertyAccessExpression)
|
|
|
|
.expression as ts.Identifier;
|
|
|
|
|
|
|
|
const expectedDeclarationNode =
|
|
|
|
getSourceFileOrError(program, _('/node_modules/@angular/core/index.d.ts'));
|
|
|
|
const actualDeclaration = host.getDeclarationOfIdentifier(identifierOfDirective);
|
|
|
|
expect(actualDeclaration).not.toBe(null);
|
|
|
|
expect(actualDeclaration !.node).toBe(expectedDeclarationNode);
|
|
|
|
expect(actualDeclaration !.viaModule).toBe('@angular/core');
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getExportsOfModule()', () => {
|
|
|
|
it('should return a map of all the exports from a given module', () => {
|
|
|
|
loadFakeCore(getFileSystem());
|
|
|
|
loadTestFiles(EXPORTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/index.js'));
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const file = getSourceFileOrError(program, _('/b_module.js'));
|
|
|
|
const exportDeclarations = host.getExportsOfModule(file);
|
|
|
|
expect(exportDeclarations).not.toBe(null);
|
|
|
|
expect(Array.from(exportDeclarations !.entries())
|
fix(ivy): in ngcc, handle inline exports in commonjs code (#32129)
One of the compiler's tasks is to enumerate the exports of a given ES
module. This can happen for example to resolve `foo.bar` where `foo` is a
namespace import:
```typescript
import * as foo from './foo';
@NgModule({
directives: [foo.DIRECTIVES],
})
```
In this case, the compiler must enumerate the exports of `foo.ts` in order
to evaluate the expression `foo.DIRECTIVES`.
When this operation occurs under ngcc, it must deal with the different
module formats and types of exports that occur. In commonjs code, a problem
arises when certain exports are downleveled.
```typescript
export const DIRECTIVES = [
FooDir,
BarDir,
];
```
can be downleveled to:
```javascript
exports.DIRECTIVES = [
FooDir,
BarDir,
```
Previously, ngtsc and ngcc expected that any export would have an associated
`ts.Declaration` node. `export class`, `export function`, etc. all retain
`ts.Declaration`s even when downleveled. But the `export const` construct
above does not. Therefore, ngcc would not detect `DIRECTIVES` as an export
of `foo.ts`, and the evaluation of `foo.DIRECTIVES` would therefore fail.
To solve this problem, the core concept of an exported `Declaration`
according to the `ReflectionHost` API is split into a `ConcreteDeclaration`
which has a `ts.Declaration`, and an `InlineDeclaration` which instead has
a `ts.Expression`. Differentiating between these allows ngcc to return an
`InlineDeclaration` for `DIRECTIVES` and correctly keep track of this
export.
PR Close #32129
2019-08-13 19:08:53 -04:00
|
|
|
.map(entry => [entry[0], entry[1].node !.getText(), entry[1].viaModule]))
|
2019-06-06 15:22:32 -04:00
|
|
|
.toEqual([
|
|
|
|
['Directive', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
|
|
|
|
['a', `a = 'a'`, './a_module'],
|
|
|
|
['b', `b = a_module.a`, null],
|
|
|
|
['c', `a = 'a'`, './a_module'],
|
|
|
|
['d', `b = a_module.a`, null],
|
|
|
|
['e', `e = 'e'`, null],
|
|
|
|
['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, '@angular/core'],
|
|
|
|
[
|
|
|
|
'SomeClass',
|
|
|
|
`SomeClass = (function() {\n function SomeClass() {}\n return SomeClass;\n}())`,
|
|
|
|
null
|
|
|
|
],
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should handle wildcard re-exports of other modules', () => {
|
|
|
|
loadFakeCore(getFileSystem());
|
|
|
|
loadTestFiles(EXPORTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/index.js'));
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const file = getSourceFileOrError(program, _('/wildcard_reexports.js'));
|
|
|
|
const exportDeclarations = host.getExportsOfModule(file);
|
|
|
|
expect(exportDeclarations).not.toBe(null);
|
|
|
|
expect(Array.from(exportDeclarations !.entries())
|
fix(ivy): in ngcc, handle inline exports in commonjs code (#32129)
One of the compiler's tasks is to enumerate the exports of a given ES
module. This can happen for example to resolve `foo.bar` where `foo` is a
namespace import:
```typescript
import * as foo from './foo';
@NgModule({
directives: [foo.DIRECTIVES],
})
```
In this case, the compiler must enumerate the exports of `foo.ts` in order
to evaluate the expression `foo.DIRECTIVES`.
When this operation occurs under ngcc, it must deal with the different
module formats and types of exports that occur. In commonjs code, a problem
arises when certain exports are downleveled.
```typescript
export const DIRECTIVES = [
FooDir,
BarDir,
];
```
can be downleveled to:
```javascript
exports.DIRECTIVES = [
FooDir,
BarDir,
```
Previously, ngtsc and ngcc expected that any export would have an associated
`ts.Declaration` node. `export class`, `export function`, etc. all retain
`ts.Declaration`s even when downleveled. But the `export const` construct
above does not. Therefore, ngcc would not detect `DIRECTIVES` as an export
of `foo.ts`, and the evaluation of `foo.DIRECTIVES` would therefore fail.
To solve this problem, the core concept of an exported `Declaration`
according to the `ReflectionHost` API is split into a `ConcreteDeclaration`
which has a `ts.Declaration`, and an `InlineDeclaration` which instead has
a `ts.Expression`. Differentiating between these allows ngcc to return an
`InlineDeclaration` for `DIRECTIVES` and correctly keep track of this
export.
PR Close #32129
2019-08-13 19:08:53 -04:00
|
|
|
.map(entry => [entry[0], entry[1].node !.getText(), entry[1].viaModule]))
|
2019-06-06 15:22:32 -04:00
|
|
|
.toEqual([
|
|
|
|
['Directive', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
|
|
|
|
['a', `a = 'a'`, _('/b_module')],
|
|
|
|
['b', `b = a_module.a`, _('/b_module')],
|
|
|
|
['c', `a = 'a'`, _('/b_module')],
|
|
|
|
['d', `b = a_module.a`, _('/b_module')],
|
|
|
|
['e', `e = 'e'`, _('/b_module')],
|
|
|
|
['DirectiveX', `Directive: FnWithArg<(clazz: any) => any>`, _('/b_module')],
|
|
|
|
[
|
|
|
|
'SomeClass',
|
|
|
|
`SomeClass = (function() {\n function SomeClass() {}\n return SomeClass;\n}())`,
|
|
|
|
_('/b_module')
|
|
|
|
],
|
|
|
|
['xtra1', `xtra1 = 'xtra1'`, _('/xtra_module')],
|
|
|
|
['xtra2', `xtra2 = 'xtra2'`, _('/xtra_module')],
|
|
|
|
]);
|
|
|
|
});
|
fix(ivy): in ngcc, handle inline exports in commonjs code (#32129)
One of the compiler's tasks is to enumerate the exports of a given ES
module. This can happen for example to resolve `foo.bar` where `foo` is a
namespace import:
```typescript
import * as foo from './foo';
@NgModule({
directives: [foo.DIRECTIVES],
})
```
In this case, the compiler must enumerate the exports of `foo.ts` in order
to evaluate the expression `foo.DIRECTIVES`.
When this operation occurs under ngcc, it must deal with the different
module formats and types of exports that occur. In commonjs code, a problem
arises when certain exports are downleveled.
```typescript
export const DIRECTIVES = [
FooDir,
BarDir,
];
```
can be downleveled to:
```javascript
exports.DIRECTIVES = [
FooDir,
BarDir,
```
Previously, ngtsc and ngcc expected that any export would have an associated
`ts.Declaration` node. `export class`, `export function`, etc. all retain
`ts.Declaration`s even when downleveled. But the `export const` construct
above does not. Therefore, ngcc would not detect `DIRECTIVES` as an export
of `foo.ts`, and the evaluation of `foo.DIRECTIVES` would therefore fail.
To solve this problem, the core concept of an exported `Declaration`
according to the `ReflectionHost` API is split into a `ConcreteDeclaration`
which has a `ts.Declaration`, and an `InlineDeclaration` which instead has
a `ts.Expression`. Differentiating between these allows ngcc to return an
`InlineDeclaration` for `DIRECTIVES` and correctly keep track of this
export.
PR Close #32129
2019-08-13 19:08:53 -04:00
|
|
|
|
|
|
|
it('should handle inline exports', () => {
|
|
|
|
loadTestFiles([INLINE_EXPORT_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/inline_export.js'));
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const file = getSourceFileOrError(program, _('/inline_export.js'));
|
|
|
|
const exportDeclarations = host.getExportsOfModule(file);
|
|
|
|
expect(exportDeclarations).not.toBeNull();
|
|
|
|
const decl = exportDeclarations !.get('directives') as InlineDeclaration;
|
|
|
|
expect(decl).not.toBeUndefined();
|
|
|
|
expect(decl.node).toBeNull();
|
|
|
|
expect(decl.expression).toBeDefined();
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getClassSymbol()', () => {
|
|
|
|
it('should return the class symbol for an ES2015 class', () => {
|
|
|
|
loadTestFiles([SIMPLE_ES2015_CLASS_FILE]);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(SIMPLE_ES2015_CLASS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const node = getDeclaration(
|
|
|
|
program, SIMPLE_ES2015_CLASS_FILE.name, 'EmptyClass', isNamedClassDeclaration);
|
|
|
|
const classSymbol = host.getClassSymbol(node);
|
|
|
|
|
|
|
|
expect(classSymbol).toBeDefined();
|
|
|
|
expect(classSymbol !.valueDeclaration).toBe(node);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return the class symbol for an ES5 class (outer variable declaration)', () => {
|
|
|
|
loadTestFiles([SIMPLE_CLASS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const node = getDeclaration(
|
|
|
|
program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
|
|
|
|
const classSymbol = host.getClassSymbol(node);
|
|
|
|
|
|
|
|
expect(classSymbol).toBeDefined();
|
|
|
|
expect(classSymbol !.valueDeclaration).toBe(node);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return the class symbol for an ES5 class (inner function declaration)', () => {
|
|
|
|
loadTestFiles([SIMPLE_CLASS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const outerNode = getDeclaration(
|
|
|
|
program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
|
|
|
|
const innerNode = getIifeBody(outerNode) !.statements.find(isNamedFunctionDeclaration) !;
|
|
|
|
const classSymbol = host.getClassSymbol(innerNode);
|
|
|
|
|
|
|
|
expect(classSymbol).toBeDefined();
|
|
|
|
expect(classSymbol !.valueDeclaration).toBe(outerNode);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return the same class symbol (of the outer declaration) for outer and inner declarations',
|
|
|
|
() => {
|
|
|
|
loadTestFiles([SIMPLE_CLASS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const outerNode = getDeclaration(
|
|
|
|
program, SIMPLE_CLASS_FILE.name, 'EmptyClass', isNamedVariableDeclaration);
|
|
|
|
const innerNode =
|
|
|
|
getIifeBody(outerNode) !.statements.find(isNamedFunctionDeclaration) !;
|
|
|
|
|
|
|
|
expect(host.getClassSymbol(innerNode)).toBe(host.getClassSymbol(outerNode));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return undefined if node is not an ES5 class', () => {
|
|
|
|
loadTestFiles([FOO_FUNCTION_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(FOO_FUNCTION_FILE.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const node =
|
|
|
|
getDeclaration(program, FOO_FUNCTION_FILE.name, 'foo', isNamedFunctionDeclaration);
|
|
|
|
const classSymbol = host.getClassSymbol(node);
|
|
|
|
|
|
|
|
expect(classSymbol).toBeUndefined();
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('isClass()', () => {
|
|
|
|
let host: CommonJsReflectionHost;
|
|
|
|
let mockNode: ts.Node;
|
|
|
|
let getClassDeclarationSpy: jasmine.Spy;
|
|
|
|
let superGetClassDeclarationSpy: jasmine.Spy;
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
loadTestFiles([SIMPLE_CLASS_FILE]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(SIMPLE_CLASS_FILE.name);
|
|
|
|
host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
mockNode = {} as any;
|
|
|
|
|
|
|
|
getClassDeclarationSpy = spyOn(CommonJsReflectionHost.prototype, 'getClassDeclaration');
|
|
|
|
superGetClassDeclarationSpy =
|
|
|
|
spyOn(Esm2015ReflectionHost.prototype, 'getClassDeclaration');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return true if superclass returns true', () => {
|
|
|
|
superGetClassDeclarationSpy.and.returnValue(true);
|
|
|
|
getClassDeclarationSpy.and.callThrough();
|
|
|
|
|
|
|
|
expect(host.isClass(mockNode)).toBe(true);
|
|
|
|
expect(getClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
|
|
|
|
expect(superGetClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return true if it can find a declaration for the class', () => {
|
|
|
|
getClassDeclarationSpy.and.returnValue(true);
|
|
|
|
|
|
|
|
expect(host.isClass(mockNode)).toBe(true);
|
|
|
|
expect(getClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return false if it cannot find a declaration for the class', () => {
|
|
|
|
getClassDeclarationSpy.and.returnValue(false);
|
|
|
|
|
|
|
|
expect(host.isClass(mockNode)).toBe(false);
|
|
|
|
expect(getClassDeclarationSpy).toHaveBeenCalledWith(mockNode);
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('hasBaseClass()', () => {
|
|
|
|
function hasBaseClass(source: string) {
|
|
|
|
const file = {
|
|
|
|
name: _('/synthesized_constructors.js'),
|
|
|
|
contents: source,
|
|
|
|
};
|
|
|
|
|
|
|
|
loadTestFiles([file]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(file.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode =
|
|
|
|
getDeclaration(program, file.name, 'TestClass', isNamedVariableDeclaration);
|
|
|
|
return host.hasBaseClass(classNode);
|
|
|
|
}
|
|
|
|
|
|
|
|
it('should consider an IIFE with _super parameter as having a base class', () => {
|
|
|
|
const result = hasBaseClass(`
|
2019-04-29 04:54:30 -04:00
|
|
|
var TestClass = /** @class */ (function (_super) {
|
|
|
|
__extends(TestClass, _super);
|
|
|
|
function TestClass() {}
|
|
|
|
return TestClass;
|
|
|
|
}(null));`);
|
2019-06-06 15:22:32 -04:00
|
|
|
expect(result).toBe(true);
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
it('should consider an IIFE with a unique name generated for the _super parameter as having a base class',
|
|
|
|
() => {
|
|
|
|
const result = hasBaseClass(`
|
2019-04-29 04:54:30 -04:00
|
|
|
var TestClass = /** @class */ (function (_super_1) {
|
|
|
|
__extends(TestClass, _super_1);
|
|
|
|
function TestClass() {}
|
|
|
|
return TestClass;
|
|
|
|
}(null));`);
|
2019-06-06 15:22:32 -04:00
|
|
|
expect(result).toBe(true);
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
it('should not consider an IIFE without parameter as having a base class', () => {
|
|
|
|
const result = hasBaseClass(`
|
2019-04-29 04:54:30 -04:00
|
|
|
var TestClass = /** @class */ (function () {
|
|
|
|
__extends(TestClass, _super);
|
|
|
|
function TestClass() {}
|
|
|
|
return TestClass;
|
|
|
|
}(null));`);
|
2019-06-06 15:22:32 -04:00
|
|
|
expect(result).toBe(false);
|
|
|
|
});
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-07-18 16:05:31 -04:00
|
|
|
describe('getBaseClassExpression()', () => {
|
|
|
|
function getBaseClassIdentifier(source: string): ts.Identifier|null {
|
|
|
|
const file = {
|
|
|
|
name: _('/synthesized_constructors.js'),
|
|
|
|
contents: source,
|
|
|
|
};
|
|
|
|
|
|
|
|
loadTestFiles([file]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(file.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode =
|
|
|
|
getDeclaration(program, file.name, 'TestClass', isNamedVariableDeclaration);
|
|
|
|
const expression = host.getBaseClassExpression(classNode);
|
|
|
|
if (expression !== null && !ts.isIdentifier(expression)) {
|
|
|
|
throw new Error(
|
|
|
|
'Expected class to inherit via an identifier but got: ' + expression.getText());
|
|
|
|
}
|
|
|
|
return expression;
|
|
|
|
}
|
|
|
|
|
|
|
|
it('should find the base class of an IIFE with _super parameter', () => {
|
|
|
|
const identifier = getBaseClassIdentifier(`
|
|
|
|
var BaseClass = /** @class */ (function () {
|
|
|
|
function BaseClass() {}
|
|
|
|
return BaseClass;
|
|
|
|
}());
|
|
|
|
var TestClass = /** @class */ (function (_super) {
|
|
|
|
__extends(TestClass, _super);
|
|
|
|
function TestClass() {}
|
|
|
|
return TestClass;
|
|
|
|
}(BaseClass));`);
|
|
|
|
expect(identifier !.text).toBe('BaseClass');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find the base class of an IIFE with a unique name generated for the _super parameter',
|
|
|
|
() => {
|
|
|
|
const identifier = getBaseClassIdentifier(`
|
|
|
|
var BaseClass = /** @class */ (function () {
|
|
|
|
function BaseClass() {}
|
|
|
|
return BaseClass;
|
|
|
|
}());
|
|
|
|
var TestClass = /** @class */ (function (_super_1) {
|
|
|
|
__extends(TestClass, _super_1);
|
|
|
|
function TestClass() {}
|
|
|
|
return TestClass;
|
|
|
|
}(BaseClass));`);
|
|
|
|
expect(identifier !.text).toBe('BaseClass');
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should not find a base class for an IIFE without parameter', () => {
|
|
|
|
const identifier = getBaseClassIdentifier(`
|
|
|
|
var BaseClass = /** @class */ (function () {
|
|
|
|
function BaseClass() {}
|
|
|
|
return BaseClass;
|
|
|
|
}());
|
|
|
|
var TestClass = /** @class */ (function () {
|
|
|
|
__extends(TestClass, _super);
|
|
|
|
function TestClass() {}
|
|
|
|
return TestClass;
|
|
|
|
}(BaseClass));`);
|
|
|
|
expect(identifier).toBe(null);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find a dynamic base class expression of an IIFE', () => {
|
|
|
|
const file = {
|
|
|
|
name: _('/synthesized_constructors.js'),
|
|
|
|
contents: `
|
|
|
|
var BaseClass = /** @class */ (function () {
|
|
|
|
function BaseClass() {}
|
|
|
|
return BaseClass;
|
|
|
|
}());
|
|
|
|
function foo() { return BaseClass; }
|
|
|
|
var TestClass = /** @class */ (function (_super) {
|
|
|
|
__extends(TestClass, _super);
|
|
|
|
function TestClass() {}
|
|
|
|
return TestClass;
|
|
|
|
}(foo()));`,
|
|
|
|
};
|
|
|
|
|
|
|
|
loadTestFiles([file]);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(file.name);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const classNode =
|
|
|
|
getDeclaration(program, file.name, 'TestClass', isNamedVariableDeclaration);
|
|
|
|
const expression = host.getBaseClassExpression(classNode) !;
|
|
|
|
expect(expression.getText()).toBe('foo()');
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('findClassSymbols()', () => {
|
|
|
|
it('should return an array of all classes in the given source file', () => {
|
|
|
|
loadTestFiles(DECORATED_FILES);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(getRootFiles(DECORATED_FILES)[0]);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const primaryFile = getSourceFileOrError(program, DECORATED_FILES[0].name);
|
|
|
|
const secondaryFile = getSourceFileOrError(program, DECORATED_FILES[1].name);
|
|
|
|
|
|
|
|
const classSymbolsPrimary = host.findClassSymbols(primaryFile);
|
|
|
|
expect(classSymbolsPrimary.length).toEqual(2);
|
|
|
|
expect(classSymbolsPrimary.map(c => c.name)).toEqual(['A', 'B']);
|
|
|
|
|
|
|
|
const classSymbolsSecondary = host.findClassSymbols(secondaryFile);
|
|
|
|
expect(classSymbolsSecondary.length).toEqual(1);
|
|
|
|
expect(classSymbolsSecondary.map(c => c.name)).toEqual(['D']);
|
|
|
|
});
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getDecoratorsOfSymbol()', () => {
|
|
|
|
it('should return decorators of class symbol', () => {
|
|
|
|
loadTestFiles(DECORATED_FILES);
|
|
|
|
const {program, host: compilerHost} =
|
|
|
|
makeTestBundleProgram(getRootFiles(DECORATED_FILES)[0]);
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const primaryFile = getSourceFileOrError(program, DECORATED_FILES[0].name);
|
|
|
|
const secondaryFile = getSourceFileOrError(program, DECORATED_FILES[1].name);
|
|
|
|
|
|
|
|
const classSymbolsPrimary = host.findClassSymbols(primaryFile);
|
|
|
|
const classDecoratorsPrimary =
|
|
|
|
classSymbolsPrimary.map(s => host.getDecoratorsOfSymbol(s));
|
|
|
|
expect(classDecoratorsPrimary.length).toEqual(2);
|
|
|
|
expect(classDecoratorsPrimary[0] !.map(d => d.name)).toEqual(['Directive']);
|
|
|
|
expect(classDecoratorsPrimary[1] !.map(d => d.name)).toEqual(['Directive']);
|
|
|
|
|
|
|
|
const classSymbolsSecondary = host.findClassSymbols(secondaryFile);
|
|
|
|
const classDecoratorsSecondary =
|
|
|
|
classSymbolsSecondary.map(s => host.getDecoratorsOfSymbol(s));
|
|
|
|
expect(classDecoratorsSecondary.length).toEqual(1);
|
|
|
|
expect(classDecoratorsSecondary[0] !.map(d => d.name)).toEqual(['Directive']);
|
|
|
|
});
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getDtsDeclarationsOfClass()', () => {
|
|
|
|
it('should find the dts declaration that has the same relative path to the source file',
|
|
|
|
() => {
|
|
|
|
loadTestFiles(TYPINGS_SRC_FILES);
|
|
|
|
loadTestFiles(TYPINGS_DTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const dts = makeTestDtsBundleProgram(_('/typings/index.d.ts'));
|
|
|
|
const class1 =
|
|
|
|
getDeclaration(program, _('/src/class1.js'), 'Class1', ts.isVariableDeclaration);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
|
|
|
|
|
|
|
|
const dtsDeclaration = host.getDtsDeclaration(class1);
|
|
|
|
expect(dtsDeclaration !.getSourceFile().fileName).toEqual(_('/typings/class1.d.ts'));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find the dts declaration for exported functions', () => {
|
|
|
|
loadTestFiles(TYPINGS_SRC_FILES);
|
|
|
|
loadTestFiles(TYPINGS_DTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const dts = makeTestDtsBundleProgram(_('/typings/index.d.ts'));
|
|
|
|
const mooFn =
|
|
|
|
getDeclaration(program, _('/src/func1.js'), 'mooFn', ts.isFunctionDeclaration);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
|
|
|
|
const dtsDeclaration = host.getDtsDeclaration(mooFn);
|
|
|
|
expect(dtsDeclaration !.getSourceFile().fileName).toEqual(_('/typings/func1.d.ts'));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return null if there is no matching class in the matching dts file', () => {
|
|
|
|
loadTestFiles(TYPINGS_SRC_FILES);
|
|
|
|
loadTestFiles(TYPINGS_DTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const dts = makeTestDtsBundleProgram(_('/typings/index.d.ts'));
|
|
|
|
const missingClass = getDeclaration(
|
|
|
|
program, _('/src/class1.js'), 'MissingClass1', ts.isVariableDeclaration);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
|
|
|
|
|
|
|
|
expect(host.getDtsDeclaration(missingClass)).toBe(null);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should return null if there is no matching dts file', () => {
|
|
|
|
loadTestFiles(TYPINGS_SRC_FILES);
|
|
|
|
loadTestFiles(TYPINGS_DTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const dts = makeTestDtsBundleProgram(_('/typings/index.d.ts'));
|
|
|
|
const missingClass = getDeclaration(
|
|
|
|
program, _('/src/missing-class.js'), 'MissingClass2', ts.isVariableDeclaration);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
|
|
|
|
|
|
|
|
expect(host.getDtsDeclaration(missingClass)).toBe(null);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find the dts file that contains a matching class declaration, even if the source files do not match',
|
|
|
|
() => {
|
|
|
|
loadTestFiles(TYPINGS_SRC_FILES);
|
|
|
|
loadTestFiles(TYPINGS_DTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const dts = makeTestDtsBundleProgram(_('/typings/index.d.ts'));
|
|
|
|
const class1 = getDeclaration(
|
|
|
|
program, _('/src/flat-file.js'), 'Class1', ts.isVariableDeclaration);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
|
|
|
|
|
|
|
|
const dtsDeclaration = host.getDtsDeclaration(class1);
|
|
|
|
expect(dtsDeclaration !.getSourceFile().fileName).toEqual(_('/typings/class1.d.ts'));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find aliased exports', () => {
|
|
|
|
loadTestFiles(TYPINGS_SRC_FILES);
|
|
|
|
loadTestFiles(TYPINGS_DTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const dts = makeTestDtsBundleProgram(_('/typings/index.d.ts'));
|
|
|
|
const class3 =
|
|
|
|
getDeclaration(program, _('/src/flat-file.js'), 'Class3', ts.isVariableDeclaration);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
|
|
|
|
|
|
|
|
const dtsDeclaration = host.getDtsDeclaration(class3);
|
|
|
|
expect(dtsDeclaration !.getSourceFile().fileName).toEqual(_('/typings/class3.d.ts'));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find the dts file that contains a matching class declaration, even if the class is not publicly exported',
|
|
|
|
() => {
|
|
|
|
loadTestFiles(TYPINGS_SRC_FILES);
|
|
|
|
loadTestFiles(TYPINGS_DTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const dts = makeTestDtsBundleProgram(_('/typings/index.d.ts'));
|
|
|
|
const internalClass = getDeclaration(
|
|
|
|
program, _('/src/internal.js'), 'InternalClass', ts.isVariableDeclaration);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
|
|
|
|
|
|
|
|
const dtsDeclaration = host.getDtsDeclaration(internalClass);
|
|
|
|
expect(dtsDeclaration !.getSourceFile().fileName).toEqual(_('/typings/internal.d.ts'));
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should prefer the publicly exported class if there are multiple classes with the same name',
|
|
|
|
() => {
|
|
|
|
loadTestFiles(TYPINGS_SRC_FILES);
|
|
|
|
loadTestFiles(TYPINGS_DTS_FILES);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const dts = makeTestDtsBundleProgram(_('/typings/index.d.ts'));
|
|
|
|
const class2 =
|
|
|
|
getDeclaration(program, _('/src/class2.js'), 'Class2', ts.isVariableDeclaration);
|
|
|
|
const internalClass2 =
|
|
|
|
getDeclaration(program, _('/src/internal.js'), 'Class2', ts.isVariableDeclaration);
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost, dts);
|
|
|
|
|
|
|
|
const class2DtsDeclaration = host.getDtsDeclaration(class2);
|
|
|
|
expect(class2DtsDeclaration !.getSourceFile().fileName)
|
|
|
|
.toEqual(_('/typings/class2.d.ts'));
|
|
|
|
|
|
|
|
const internalClass2DtsDeclaration = host.getDtsDeclaration(internalClass2);
|
|
|
|
expect(internalClass2DtsDeclaration !.getSourceFile().fileName)
|
|
|
|
.toEqual(_('/typings/class2.d.ts'));
|
|
|
|
});
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
|
2019-06-06 15:22:32 -04:00
|
|
|
describe('getModuleWithProvidersFunctions', () => {
|
|
|
|
it('should find every exported function that returns an object that looks like a ModuleWithProviders object',
|
|
|
|
() => {
|
|
|
|
loadTestFiles(MODULE_WITH_PROVIDERS_PROGRAM);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const file = getSourceFileOrError(program, _('/src/functions.js'));
|
|
|
|
const fns = host.getModuleWithProvidersFunctions(file);
|
|
|
|
expect(fns.map(fn => [fn.declaration.name !.getText(), fn.ngModule.node.name.text]))
|
|
|
|
.toEqual([
|
|
|
|
['ngModuleIdentifier', 'InternalModule'],
|
|
|
|
['ngModuleWithEmptyProviders', 'InternalModule'],
|
|
|
|
['ngModuleWithProviders', 'InternalModule'],
|
|
|
|
['externalNgModule', 'ExternalModule'],
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should find every static method on exported classes that return an object that looks like a ModuleWithProviders object',
|
|
|
|
() => {
|
|
|
|
loadTestFiles(MODULE_WITH_PROVIDERS_PROGRAM);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const host =
|
|
|
|
new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const file = getSourceFileOrError(program, _('/src/methods.js'));
|
|
|
|
const fn = host.getModuleWithProvidersFunctions(file);
|
|
|
|
expect(fn.map(fn => [fn.declaration.getText(), fn.ngModule.node.name.text])).toEqual([
|
|
|
|
[
|
|
|
|
'function() { return { ngModule: InternalModule }; }',
|
|
|
|
'InternalModule',
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'function() { return { ngModule: InternalModule, providers: [] }; }',
|
|
|
|
'InternalModule',
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'function() { return { ngModule: InternalModule, providers: [SomeService] }; }',
|
|
|
|
'InternalModule',
|
|
|
|
],
|
|
|
|
[
|
|
|
|
'function() { return { ngModule: mod.ExternalModule }; }',
|
|
|
|
'ExternalModule',
|
|
|
|
],
|
2019-04-29 04:54:30 -04:00
|
|
|
]);
|
2019-06-06 15:22:32 -04:00
|
|
|
});
|
|
|
|
|
|
|
|
// https://github.com/angular/angular/issues/29078
|
|
|
|
it('should resolve aliased module references to their original declaration', () => {
|
|
|
|
loadTestFiles(MODULE_WITH_PROVIDERS_PROGRAM);
|
|
|
|
const {program, host: compilerHost} = makeTestBundleProgram(_('/src/index.js'));
|
|
|
|
const host = new CommonJsReflectionHost(new MockLogger(), false, program, compilerHost);
|
|
|
|
const file = getSourceFileOrError(program, _('/src/aliased_class.js'));
|
|
|
|
const fn = host.getModuleWithProvidersFunctions(file);
|
|
|
|
expect(fn.map(fn => [fn.declaration.getText(), fn.ngModule.node.name.text])).toEqual([
|
|
|
|
['function() { return { ngModule: AliasedModule_1 }; }', 'AliasedModule'],
|
|
|
|
]);
|
|
|
|
});
|
|
|
|
});
|
2019-04-29 04:54:30 -04:00
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|