Fix computed property names of types and abstract members

microsoft · Jan 16, 2020 · a5ca492 · a5ca492
1 parent 1044c5c
commit a5ca492
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1868,7 +1868,7 @@ namespace ts {
             if (
                 !(useSite.flags & NodeFlags.Ambient) &&
                 !isPartOfTypeQuery(useSite) &&
-                !isPartOfPossiblyValidComputedPropertyNameExpression(useSite) &&
+                !isPartOfPossiblyValidTypeOrAbstractComputedPropertyName(useSite) &&
                 isExpressionNode(useSite)
             ) {
                 const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(symbol);

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -1778,11 +1778,22 @@ namespace ts {
         return node.kind === SyntaxKind.TypeQuery;
     }
 
-    export function isPartOfPossiblyValidComputedPropertyNameExpression(node: Node) {
+    export function isPartOfPossiblyValidTypeOrAbstractComputedPropertyName(node: Node) {
         while (node.kind === SyntaxKind.Identifier || node.kind === SyntaxKind.PropertyAccessExpression) {
             node = node.parent;
         }
-        return node.kind === SyntaxKind.ComputedPropertyName;
+        if (node.kind !== SyntaxKind.ComputedPropertyName) {
+            return false;
+        }
+        if (hasModifier(node.parent, ModifierFlags.Abstract)) {
+            return true;
+        }
+        const containerKind = node.parent.parent.kind;
+        return containerKind === SyntaxKind.InterfaceDeclaration || containerKind === SyntaxKind.TypeLiteral;
+    }
+
+    export function isAbstractDeclarationName(node: Node) {
+        return isDeclarationName(node) && hasModifier(node, ModifierFlags.Abstract);
     }
 
     export function isExternalModuleImportEqualsDeclaration(node: Node): node is ImportEqualsDeclaration & { moduleReference: ExternalModuleReference } {

diff --git a/tests/cases/conformance/externalModules/typeOnly/computedPropertyName.ts b/tests/cases/conformance/externalModules/typeOnly/computedPropertyName.ts
@@ -9,3 +9,35 @@ import type { onInit } from "./framework-hooks";
 interface Component {
   [onInit]?(): void;
 }
+
+type T = {
+  [onInit]: any;
+}
+
+const o = {
+  [onInit]: 0 // Error
+};
+
+class C {
+  [onInit]: any; // Error (because class fields)
+}
+
+class D {
+  [onInit] = 0; // Error
+}
+
+class E {
+  [onInit]() {} // Error
+}
+
+abstract class F {
+  abstract [onInit](): void;
+}
+
+class G {
+  declare [onInit]: any;
+}
+
+declare class H {
+  [onInit]: any;
+}