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

Revert "feat(core): support metadata reflection for native class types (#22356)" 

This reverts commit 5c89d6bffa.
This commit is contained in:
Victor Berchet 2018-02-22 10:16:36 -08:00
parent ca06af40f4
commit 90e9c59e23
2 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/src/reflection/reflection_capabilities.ts
View File

@ -15,12 +15,9 @@ import {GetterFn, MethodFn, SetterFn} from './types';
/**
* Attention: These regex has to hold even if the code is minified!
* Attention: This regex has to hold even if the code is minified!
*/
export const DELEGATE_CTOR = /^function\s+\S+\(\)\s*{[\s\S]+\.apply\(this,\s*arguments\)/;
export const INHERITED_CLASS = /^class\s+[A-Za-z\d$_]*\s*extends\s+[A-Za-z\d$_]+\s*{/;
export const INHERITED_CLASS_WITH_CTOR =
/^class\s+[A-Za-z\d$_]*\s*extends\s+[A-Za-z\d$_]+\s*{[\s\S]*constructor\s*\(/;
export class ReflectionCapabilities implements PlatformReflectionCapabilities {
private _reflect: any;
@ -60,7 +57,6 @@ export class ReflectionCapabilities implements PlatformReflectionCapabilities {
}
private _ownParameters(type: Type<any>, parentCtor: any): any[][]|null {
const typeStr = type.toString();
// If we have no decorators, we only have function.length as metadata.
// In that case, to detect whether a child class declared an own constructor or not,
// we need to look inside of that constructor to check whether it is
@ -68,8 +64,7 @@ export class ReflectionCapabilities implements PlatformReflectionCapabilities {
// This also helps to work around for https://github.com/Microsoft/TypeScript/issues/12439
// that sets 'design:paramtypes' to []
// if a class inherits from another class but has no ctor declared itself.
if (DELEGATE_CTOR.exec(typeStr) ||
(INHERITED_CLASS.exec(typeStr) && !INHERITED_CLASS_WITH_CTOR.exec(typeStr))) {
if (DELEGATE_CTOR.exec(type.toString())) {
return null;
}

37
packages/core/test/reflection/reflector_spec.ts
View File

@ -7,7 +7,7 @@
*/
import {Reflector} from '@angular/core/src/reflection/reflection';
import {DELEGATE_CTOR, INHERITED_CLASS, INHERITED_CLASS_WITH_CTOR, ReflectionCapabilities} from '@angular/core/src/reflection/reflection_capabilities';
import {DELEGATE_CTOR, ReflectionCapabilities} from '@angular/core/src/reflection/reflection_capabilities';
import {global} from '@angular/core/src/util';
import {makeDecorator, makeParamDecorator, makePropDecorator} from '@angular/core/src/util/decorators';
@ -188,41 +188,6 @@ class TestObj {
Object.defineProperty(dummyArrowFn, 'prototype', {value: undefined});
expect(() => reflector.annotations(dummyArrowFn as any)).not.toThrow();
});
it('should support native class', () => {
const ChildNoCtor = `class ChildNoCtor extends Parent {}\n`;
const ChildWithCtor = `class ChildWithCtor extends Parent {\n` +
` constructor() { super(); }` +
`}\n`;
const ChildNoCtorPrivateProps = `class ChildNoCtorPrivateProps extends Parent {\n` +
` private x = 10;\n` +
`}\n`;
const checkNoOwnMetadata = (str: string) =>
INHERITED_CLASS.exec(str) && !INHERITED_CLASS_WITH_CTOR.exec(str);
expect(checkNoOwnMetadata(ChildNoCtor)).toBeTruthy();
expect(checkNoOwnMetadata(ChildNoCtorPrivateProps)).toBeTruthy();
expect(checkNoOwnMetadata(ChildWithCtor)).toBeFalsy();
});
it('should properly handle all class forms', () => {
const ctor = (str: string) => expect(INHERITED_CLASS.exec(str)).toBeTruthy() &&
expect(INHERITED_CLASS_WITH_CTOR.exec(str)).toBeTruthy();
const noCtor = (str: string) => expect(INHERITED_CLASS.exec(str)).toBeTruthy() &&
expect(INHERITED_CLASS_WITH_CTOR.exec(str)).toBeFalsy();
ctor(`class Bar extends Foo {constructor(){}}`);
ctor(`class Bar extends Foo { constructor ( ) {} }`);
ctor(`class Bar extends Foo { other(){}; constructor(){} }`);
noCtor(`class extends Foo{}`);
noCtor(`class extends Foo {}`);
noCtor(`class Bar extends Foo {}`);
noCtor(`class $Bar1_ extends $Fo0_ {}`);
noCtor(`class Bar extends Foo { other(){} }`);
});
});
describe('inheritance with decorators', () => {