microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-03-15 14:05:47 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(40632): skip emitting abstract members (#40699)

Browse Source
This commit is contained in:
Oleksandr T
2020-11-05 02:02:17 +02:00
committed by GitHub
parent 76cf8fd78b
commit 45b698b3f6
11 changed files with 240 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/transformers/classFields.ts
View File

@@ -579,7 +579,7 @@ namespace ts {
}
function isPropertyDeclarationThatRequiresConstructorStatement(member: ClassElement): member is PropertyDeclaration {
if (!isPropertyDeclaration(member) || hasStaticModifier(member)) {
if (!isPropertyDeclaration(member) || hasStaticModifier(member) || hasSyntacticModifier(getOriginalNode(member), ModifierFlags.Abstract)) {
return false;
}
if (context.getCompilerOptions().useDefineForClassFields) {
@@ -779,6 +779,9 @@ namespace ts {
}
const propertyOriginalNode = getOriginalNode(property);
if (hasSyntacticModifier(propertyOriginalNode, ModifierFlags.Abstract)) {
return undefined;
}
const initializer = property.initializer || emitAssignment ? visitNode(property.initializer, visitor, isExpression) ?? factory.createVoidZero()
: isParameterPropertyDeclaration(propertyOriginalNode, propertyOriginalNode.parent) && isIdentifier(propertyName) ? propertyName
: factory.createVoidZero();

2
src/compiler/transformers/ts.ts
View File

@@ -1900,7 +1900,7 @@ namespace ts {
}
function visitPropertyDeclaration(node: PropertyDeclaration) {
if (node.flags & NodeFlags.Ambient) {
if (node.flags & NodeFlags.Ambient || hasSyntacticModifier(node, ModifierFlags.Abstract)) {
return undefined;
}
const updated = factory.updatePropertyDeclaration(

38
tests/baselines/reference/abstractProperty(target=es2015).js Normal file
View File

@@ -0,0 +1,38 @@
//// [abstractProperty.ts]
abstract class A {
protected abstract x: string;
public foo() {
console.log(this.x);
}
}
class B extends A {
protected x = 'B.x';
}
class C extends A {
protected get x() { return 'C.x' };
}
//// [abstractProperty.js]
class A {
foo() {
console.log(this.x);
}
}
class B extends A {
constructor() {
super(...arguments);
Object.defineProperty(this, "x", {
enumerable: true,
configurable: true,
writable: true,
value: 'B.x'
});
}
}
class C extends A {
get x() { return 'C.x'; }
;
}

36
tests/baselines/reference/abstractProperty(target=es2015).symbols Normal file
View File

@@ -0,0 +1,36 @@
=== tests/cases/conformance/classes/propertyMemberDeclarations/abstractProperty.ts ===
abstract class A {
>A : Symbol(A, Decl(abstractProperty.ts, 0, 0))
protected abstract x: string;
>x : Symbol(A.x, Decl(abstractProperty.ts, 0, 18))
public foo() {
>foo : Symbol(A.foo, Decl(abstractProperty.ts, 1, 33))
console.log(this.x);
>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
>this.x : Symbol(A.x, Decl(abstractProperty.ts, 0, 18))
>this : Symbol(A, Decl(abstractProperty.ts, 0, 0))
>x : Symbol(A.x, Decl(abstractProperty.ts, 0, 18))
}
}
class B extends A {
>B : Symbol(B, Decl(abstractProperty.ts, 5, 1))
>A : Symbol(A, Decl(abstractProperty.ts, 0, 0))
protected x = 'B.x';
>x : Symbol(B.x, Decl(abstractProperty.ts, 7, 19))
}
class C extends A {
>C : Symbol(C, Decl(abstractProperty.ts, 9, 1))
>A : Symbol(A, Decl(abstractProperty.ts, 0, 0))
protected get x() { return 'C.x' };
>x : Symbol(C.x, Decl(abstractProperty.ts, 11, 19))
}

39
tests/baselines/reference/abstractProperty(target=es2015).types Normal file
View File

@@ -0,0 +1,39 @@
=== tests/cases/conformance/classes/propertyMemberDeclarations/abstractProperty.ts ===
abstract class A {
>A : A
protected abstract x: string;
>x : string
public foo() {
>foo : () => void
console.log(this.x);
>console.log(this.x) : void
>console.log : (...data: any[]) => void
>console : Console
>log : (...data: any[]) => void
>this.x : string
>this : this
>x : string
}
}
class B extends A {
>B : B
>A : A
protected x = 'B.x';
>x : string
>'B.x' : "B.x"
}
class C extends A {
>C : C
>A : A
protected get x() { return 'C.x' };
>x : string
>'C.x' : "C.x"
}

30
tests/baselines/reference/abstractProperty(target=esnext).js Normal file
View File

@@ -0,0 +1,30 @@
//// [abstractProperty.ts]
abstract class A {
protected abstract x: string;
public foo() {
console.log(this.x);
}
}
class B extends A {
protected x = 'B.x';
}
class C extends A {
protected get x() { return 'C.x' };
}
//// [abstractProperty.js]
class A {
foo() {
console.log(this.x);
}
}
class B extends A {
x = 'B.x';
}
class C extends A {
get x() { return 'C.x'; }
;
}

36
tests/baselines/reference/abstractProperty(target=esnext).symbols Normal file
View File

@@ -0,0 +1,36 @@
=== tests/cases/conformance/classes/propertyMemberDeclarations/abstractProperty.ts ===
abstract class A {
>A : Symbol(A, Decl(abstractProperty.ts, 0, 0))
protected abstract x: string;
>x : Symbol(A.x, Decl(abstractProperty.ts, 0, 18))
public foo() {
>foo : Symbol(A.foo, Decl(abstractProperty.ts, 1, 33))
console.log(this.x);
>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
>this.x : Symbol(A.x, Decl(abstractProperty.ts, 0, 18))
>this : Symbol(A, Decl(abstractProperty.ts, 0, 0))
>x : Symbol(A.x, Decl(abstractProperty.ts, 0, 18))
}
}
class B extends A {
>B : Symbol(B, Decl(abstractProperty.ts, 5, 1))
>A : Symbol(A, Decl(abstractProperty.ts, 0, 0))
protected x = 'B.x';
>x : Symbol(B.x, Decl(abstractProperty.ts, 7, 19))
}
class C extends A {
>C : Symbol(C, Decl(abstractProperty.ts, 9, 1))
>A : Symbol(A, Decl(abstractProperty.ts, 0, 0))
protected get x() { return 'C.x' };
>x : Symbol(C.x, Decl(abstractProperty.ts, 11, 19))
}

39
tests/baselines/reference/abstractProperty(target=esnext).types Normal file
View File

@@ -0,0 +1,39 @@
=== tests/cases/conformance/classes/propertyMemberDeclarations/abstractProperty.ts ===
abstract class A {
>A : A
protected abstract x: string;
>x : string
public foo() {
>foo : () => void
console.log(this.x);
>console.log(this.x) : void
>console.log : (...data: any[]) => void
>console : Console
>log : (...data: any[]) => void
>this.x : string
>this : this
>x : string
}
}
class B extends A {
>B : B
>A : A
protected x = 'B.x';
>x : string
>'B.x' : "B.x"
}
class C extends A {
>C : C
>A : A
protected get x() { return 'C.x' };
>x : string
>'C.x' : "C.x"
}

6
tests/baselines/reference/accessorsOverrideProperty7.js
View File

@@ -23,12 +23,6 @@ var __extends = (this && this.__extends) || (function () {
})();
var A = /** @class */ (function () {
function A() {
Object.defineProperty(this, "p", {
enumerable: true,
configurable: true,
writable: true,
value: 'yep'
});
}
return A;
}());

6
tests/baselines/reference/privateNamesIncompatibleModifiers.js
View File

@@ -14,7 +14,7 @@ abstract class B {
//// [privateNamesIncompatibleModifiers.js]
"use strict";
var _foo, _bar, _baz, _qux, _quux;
var _foo, _bar, _baz, _qux;
class A {
constructor() {
_foo.set(this, 3); // Error
@@ -25,8 +25,4 @@ class A {
}
_foo = new WeakMap(), _bar = new WeakMap(), _baz = new WeakMap(), _qux = new WeakMap();
class B {
constructor() {
_quux.set(this, 3); // Error
}
}
_quux = new WeakMap();

16
tests/cases/conformance/classes/propertyMemberDeclarations/abstractProperty.ts Normal file
View File

@@ -0,0 +1,16 @@
// @target: es2015,esnext
// @useDefineForClassFields: true
abstract class A {
protected abstract x: string;
public foo() {
console.log(this.x);
}
}
class B extends A {
protected x = 'B.x';
}
class C extends A {
protected get x() { return 'C.x' };
}