feat(typescript-estree): computed members discriminated unions (#1349)

typescript-eslint · Dec 19, 2019 · 013df9a · 013df9a
1 parent bf4ad5b
commit 013df9a
Show file tree

Hide file tree

Showing 15 changed files with 3,782 additions and 1,823 deletions.
diff --git a/packages/eslint-plugin/src/rules/indent.ts b/packages/eslint-plugin/src/rules/indent.ts
@@ -392,7 +392,7 @@ export default util.createRule<Options, MessageIds>({
               computed: false,
               method: false,
               shorthand: false,
-            },
+            } as any,
           ],
 
           // location data

diff --git a/packages/eslint-plugin/src/rules/no-untyped-public-signature.ts b/packages/eslint-plugin/src/rules/no-untyped-public-signature.ts
@@ -63,7 +63,7 @@ export default util.createRule<Options, MessageIds>({
       ) {
         return ignoredMethods.has(node.key.quasis[0].value.raw);
       }
-      if (node.key.type === AST_NODE_TYPES.Identifier && !node.computed) {
+      if (!node.computed && node.key.type === AST_NODE_TYPES.Identifier) {
         return ignoredMethods.has(node.key.name);
       }
 

diff --git a/packages/eslint-plugin/src/rules/prefer-for-of.ts b/packages/eslint-plugin/src/rules/prefer-for-of.ts
@@ -149,9 +149,8 @@ export default util.createRule({
       // ({ foo: a[i] }) = { foo: 0 }
       if (
         parent.type === AST_NODE_TYPES.Property &&
-        parent.parent !== undefined &&
-        parent.parent.type === AST_NODE_TYPES.ObjectExpression &&
         parent.value === node &&
+        parent.parent?.type === AST_NODE_TYPES.ObjectExpression &&
         isAssignee(parent.parent)
       ) {
         return true;

diff --git a/packages/eslint-plugin/src/util/misc.ts b/packages/eslint-plugin/src/util/misc.ts
@@ -107,29 +107,16 @@ function getNameFromMember(
     | TSESTree.TSPropertySignature,
   sourceCode: TSESLint.SourceCode,
 ): string {
-  if (isLiteralOrIdentifier(member.key)) {
-    if (member.key.type === AST_NODE_TYPES.Identifier) {
-      return member.key.name;
-    }
+  if (member.key.type === AST_NODE_TYPES.Identifier) {
+    return member.key.name;
+  }
+  if (member.key.type === AST_NODE_TYPES.Literal) {
     return `${member.key.value}`;
   }
 
   return sourceCode.text.slice(...member.key.range);
 }
 
-/**
- * This covers both actual property names, as well as computed properties that are either
- * an identifier or a literal at the top level.
- */
-function isLiteralOrIdentifier(
-  node: TSESTree.Expression,
-): node is TSESTree.Literal | TSESTree.Identifier {
-  return (
-    node.type === AST_NODE_TYPES.Literal ||
-    node.type === AST_NODE_TYPES.Identifier
-  );
-}
-
 type ExcludeKeys<
   TObj extends Record<string, unknown>,
   TKeys extends keyof TObj
@@ -148,7 +135,6 @@ export {
   InferMessageIdsTypeFromRule,
   InferOptionsTypeFromRule,
   isDefinitionFile,
-  isLiteralOrIdentifier,
   RequireKeys,
   upperCaseFirst,
 };