Jan 28, 2025 · Jan 28, 2025
diff --git a/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts b/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
    {
      allowConstantLoopConditions: false,
      allowRuleToRunWithoutStrictNullChecksIKnowWhatIAmDoing: false,
      checkTypePredicates:false,
      checkTypePredicates:true,
    },
  ],
  create(
diff --git a/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts b/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts

 assert(Math.random() > 0.5);
      `,
      options: [{ checkTypePredicates: true }],
    },
    {
      code: `
 declare function assert(x: unknown, y: unknown): asserts x;

 assert(Math.random() > 0.5, true);
      `,
      options: [{ checkTypePredicates: true }],
    },
    {
      // should not report because option is disabled.
 const thisAsserter: ThisAsserter = new ThisAsserter();
 thisAsserter.assertThis(true);
      `,
      options: [{ checkTypePredicates: true }],
    },
    {
      // could be argued that this should report since `thisAsserter` is truthy.
 const thisAsserter: ThisAsserter = new ThisAsserter();
 thisAsserter.assertThis(Math.random());
      `,
      options: [{ checkTypePredicates: true }],
    },
    {
      code: `
 declare function assert(x: unknown): asserts x;
 assert(...[]);
      `,
      options: [{ checkTypePredicates: true }],
    },
    {
      // ok to report if we start unpacking spread params one day.
      code: `
 declare function assert(x: unknown): asserts x;
 assert(...[], {});
      `,
      options: [{ checkTypePredicates: true }],
    },
    {
      code: `
 declare function assertString(x: unknown): asserts x is string;
 assertString('falafel');
      `,
      options: [{ checkTypePredicates: true }],
    },
    {
      // Technically, this has type 'falafel' and not string.
      code: `
 declare function isString(x: unknown): x is string;
 isString('falafel');
      `,
      options: [{ checkTypePredicates: true }],
    },
    `
 type A = { [name in Lowercase<string>]?: A };
          messageId: 'alwaysTruthy',
        },
      ],
      options: [{ checkTypePredicates: true }],
    },
    {
      code: `
          messageId: 'alwaysFalsy',
        },
      ],
      options: [{ checkTypePredicates: true }],
    },
    {
      code: `
          messageId: 'alwaysTruthy',
        },
      ],
      options: [{ checkTypePredicates: true }],
    },
    {
      code: `
          messageId: 'alwaysTruthy',
        },
      ],
      options: [{ checkTypePredicates: true }],
    },
    {
      code: `
          messageId: 'typeGuardAlreadyIsType',
        },
      ],
      options: [{ checkTypePredicates: true }],
    },
    {
      code: `
          messageId: 'typeGuardAlreadyIsType',
        },
      ],
      options: [{ checkTypePredicates: true }],
    },
    {
      code: `
          messageId: 'typeGuardAlreadyIsType',
        },
      ],
      options: [{ checkTypePredicates: true }],
    },

    // "branded" types
Original file line number	Diff line number	Diff line change
Expand Up		@@ -185,7 +185,7 @@ export default createRule<Options, MessageId>({
		{
		allowConstantLoopConditions: false,
		allowRuleToRunWithoutStrictNullChecksIKnowWhatIAmDoing: false,
		checkTypePredicates:false,
		checkTypePredicates:true,
		},
		],
		create(
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -965,15 +965,13 @@ declare function assert(x: unknown): asserts x;

		assert(Math.random() > 0.5);
		`,
		options: [{ checkTypePredicates: true }],
		},
		{
		code: `
		declare function assert(x: unknown, y: unknown): asserts x;

		assert(Math.random() > 0.5, true);
		`,
		options: [{ checkTypePredicates: true }],
		},
		{
		// should not report because option is disabled.
Expand All		@@ -993,7 +991,6 @@ class ThisAsserter {
		const thisAsserter: ThisAsserter = new ThisAsserter();
		thisAsserter.assertThis(true);
		`,
		options: [{ checkTypePredicates: true }],
		},
		{
		// could be argued that this should report since `thisAsserter` is truthy.
Expand All		@@ -1005,22 +1002,19 @@ class ThisAsserter {
		const thisAsserter: ThisAsserter = new ThisAsserter();
		thisAsserter.assertThis(Math.random());
		`,
		options: [{ checkTypePredicates: true }],
		},
		{
		code: `
		declare function assert(x: unknown): asserts x;
		assert(...[]);
		`,
		options: [{ checkTypePredicates: true }],
		},
		{
		// ok to report if we start unpacking spread params one day.
		code: `
		declare function assert(x: unknown): asserts x;
		assert(...[], {});
		`,
		options: [{ checkTypePredicates: true }],
		},
		{
		code: `
Expand All		@@ -1044,15 +1038,13 @@ isString(a);
		declare function assertString(x: unknown): asserts x is string;
		assertString('falafel');
		`,
		options: [{ checkTypePredicates: true }],
		},
		{
		// Technically, this has type 'falafel' and not string.
		code: `
		declare function isString(x: unknown): x is string;
		isString('falafel');
		`,
		options: [{ checkTypePredicates: true }],
		},
		`
		type A = { [name in Lowercase<string>]?: A };
Expand DownExpand Up		@@ -2874,7 +2866,6 @@ assert(true);
		messageId: 'alwaysTruthy',
		},
		],
		options: [{ checkTypePredicates: true }],
		},
		{
		code: `
Expand All		@@ -2888,7 +2879,6 @@ assert(false);
		messageId: 'alwaysFalsy',
		},
		],
		options: [{ checkTypePredicates: true }],
		},
		{
		code: `
Expand All		@@ -2903,7 +2893,6 @@ assert(true, Math.random() > 0.5);
		messageId: 'alwaysTruthy',
		},
		],
		options: [{ checkTypePredicates: true }],
		},
		{
		code: `
Expand All		@@ -2917,7 +2906,6 @@ assert({});
		messageId: 'alwaysTruthy',
		},
		],
		options: [{ checkTypePredicates: true }],
		},
		{
		code: `
Expand All		@@ -2931,7 +2919,6 @@ assertsString(a);
		messageId: 'typeGuardAlreadyIsType',
		},
		],
		options: [{ checkTypePredicates: true }],
		},
		{
		code: `
Expand All		@@ -2945,7 +2932,6 @@ isString(a);
		messageId: 'typeGuardAlreadyIsType',
		},
		],
		options: [{ checkTypePredicates: true }],
		},
		{
		code: `
Expand All		@@ -2959,7 +2945,6 @@ isString('fa' + 'lafel');
		messageId: 'typeGuardAlreadyIsType',
		},
		],
		options: [{ checkTypePredicates: true }],
		},

		// "branded" types
Expand Down