strict-type-predicates: allow comparing typeof with expression (palan…

…tir#3542)
idriss92 · Jan 9, 2018 · 18fc973 · 18fc973
1 parent 7a2bfbd
commit 18fc973
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/rules/strictTypePredicatesRule.ts b/src/rules/strictTypePredicatesRule.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { isBinaryExpression, isTypeFlagSet, isUnionType } from "tsutils";
+import { isBinaryExpression, isIdentifier, isLiteralExpression, isTypeFlagSet, isUnionType } from "tsutils";
 
 import * as ts from "typescript";
 import { showWarningOnce } from "../error";
@@ -130,11 +130,19 @@ function getTypePredicateOneWay(left: ts.Expression, right: ts.Expression, isStr
     switch (right.kind) {
         case ts.SyntaxKind.TypeOfExpression:
             const expression = (right as ts.TypeOfExpression).expression;
-            const kind = left.kind === ts.SyntaxKind.StringLiteral ? (left as ts.StringLiteral).text : "";
-            const predicate = getTypePredicateForKind(kind);
+            if (!isLiteralExpression(left)) {
+                if (isIdentifier(left) && left.text === "undefined" ||
+                    left.kind === ts.SyntaxKind.NullKeyword ||
+                    left.kind === ts.SyntaxKind.TrueKeyword ||
+                    left.kind === ts.SyntaxKind.FalseKeyword) {
+                    return {kind: TypePredicateKind.TypeofTypo};
+                }
+                return undefined;
+            }
+            const predicate = getTypePredicateForKind(left.text);
             return predicate === undefined
                 ? { kind: TypePredicateKind.TypeofTypo }
-                : { kind: TypePredicateKind.Plain, expression, predicate, isNullOrUndefined: kind === "undefined" };
+                : { kind: TypePredicateKind.Plain, expression, predicate, isNullOrUndefined: left.text === "undefined" };
 
         case ts.SyntaxKind.NullKeyword:
             return nullOrUndefined(ts.TypeFlags.Null);

diff --git a/test/rules/strict-type-predicates/strict-null-checks/test.ts.lint b/test/rules/strict-type-predicates/strict-null-checks/test.ts.lint
@@ -189,6 +189,22 @@ declare function get<T>(): T;
 
     typeof get<any>() === "orbject";
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [typeof]
+
+    typeof get<string | number>() === `string`;
+    typeof get<string | number>() === `stirng`;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [typeof]
+
+    let a: string, b: string;
+    typeof a === typeof b;
+    typeof a === b;
+    a === typeof b;
+    typeof a === undefined;
+    ~~~~~~~~~~~~~~~~~~~~~~ [F]
+
+    undefined === typeof a;
+    ~~~~~~~~~~~~~~~~~~~~~~ [typeof]
+    null === typeof b;
+    ~~~~~~~~~~~~~~~~~ [typeof]
 }
 
 [T]: Expression is always true.