Dec 23, 2024 · Dec 17, 2024 · Dec 17, 2024 · Dec 17, 2024
diff --git a/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts b/packages/eslint-plugin/src/rules/no-unnecessary-condition.ts
      compilerOptions,
      'strictNullChecks',
    );
    const isNoUncheckedIndexedAccess = tsutils.isCompilerOptionEnabled(
      compilerOptions,
      'noUncheckedIndexedAccess',
    );

    if (
      !isStrictNullChecks &&
          }
          const indexInfo = checker.getIndexInfosOfType(type);

          return indexInfo.some(
            info =>
              getTypeName(checker, info.keyType) === 'string' &&
              isNullableType(info.type),
          );
          return indexInfo.some(info => {
            const isStringTypeName =
              getTypeName(checker, info.keyType) === 'string';

            return (
              isStringTypeName &&
              (isNoUncheckedIndexedAccess || isNullableType(info.type))
            );
          });
        });
        return !isOwnNullable && isNullableType(prevType);
      }
diff --git a/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts b/packages/eslint-plugin/tests/rules/no-unnecessary-condition.test.ts
  tsconfigRootDir: rootPath,
 };

 const optionsWithNoUncheckedIndexedAccess = {
  project: './tsconfig.noUncheckedIndexedAccess.json',
  projectService: false,
  tsconfigRootDir: getFixturesRootDir(),
 };

 const necessaryConditionTest = (condition: string): string => `
 declare const b1: ${condition};
 declare const b2: boolean;
 foo?.[key]?.trim();
      `,
      languageOptions: {
        parserOptions: {
          project: './tsconfig.noUncheckedIndexedAccess.json',
          projectService: false,
          tsconfigRootDir: getFixturesRootDir(),
        },
        parserOptions: optionsWithNoUncheckedIndexedAccess,
      },
    },
    {
 }
      `,
      languageOptions: {
        parserOptions: {
          project: './tsconfig.noUncheckedIndexedAccess.json',
          projectService: false,
          tsconfigRootDir: getFixturesRootDir(),
        },
        parserOptions: optionsWithNoUncheckedIndexedAccess,
      },
    },
    {
 foo?.[key]?.trim();
      `,
      languageOptions: {
        parserOptions: {
          project: './tsconfig.noUncheckedIndexedAccess.json',
          projectService: false,
          tsconfigRootDir: getFixturesRootDir(),
        },
        parserOptions: optionsWithNoUncheckedIndexedAccess,
      },
    },
    {
      code: `
 type Foo = {
  key?: Record<string, { key: string }>;
 };
 declare const foo: Foo;
 foo.key?.someKey?.key;
      `,
      languageOptions: {
        parserOptions: optionsWithNoUncheckedIndexedAccess,
      },
    },
    {
      code: `
 type Foo = {
  key?: {
    [key: string]: () => void;
  };
 };
 declare const foo: Foo;
 foo.key?.value?.();
      `,
      languageOptions: {
        parserOptions: optionsWithNoUncheckedIndexedAccess,
      },
    },
    {
      code: `
 type A = {
  [name in Lowercase<string>]?: {
    [name in Lowercase<string>]: {
      a: 1;
    };
  };
 };

 declare const a: A;

 a.a?.a?.a;
      `,
      languageOptions: {
        parserOptions: optionsWithNoUncheckedIndexedAccess,
      },
    },
    `
Original file line number	Diff line number	Diff line change
Expand Up		@@ -273,6 +273,10 @@ export default createRule<Options, MessageId>({
		compilerOptions,
		'strictNullChecks',
		);
		const isNoUncheckedIndexedAccess = tsutils.isCompilerOptionEnabled(
		compilerOptions,
		'noUncheckedIndexedAccess',
		);

		if (
		!isStrictNullChecks &&
Expand DownExpand Up		@@ -756,11 +760,15 @@ export default createRule<Options, MessageId>({
		}
		const indexInfo = checker.getIndexInfosOfType(type);

		return indexInfo.some(
		info =>
		getTypeName(checker, info.keyType) === 'string' &&
		isNullableType(info.type),
		);
		return indexInfo.some(info => {
		const isStringTypeName =
		getTypeName(checker, info.keyType) === 'string';

		return (
		isStringTypeName &&
		(isNoUncheckedIndexedAccess \|\| isNullableType(info.type))
		);
		});
		});
		return !isOwnNullable && isNullableType(prevType);
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,6 +27,12 @@ const optionsWithExactOptionalPropertyTypes = {
		tsconfigRootDir: rootPath,
		};

		const optionsWithNoUncheckedIndexedAccess = {
		project: './tsconfig.noUncheckedIndexedAccess.json',
		projectService: false,
		tsconfigRootDir: getFixturesRootDir(),
		};

		const necessaryConditionTest = (condition: string): string => `
		declare const b1: ${condition};
		declare const b2: boolean;
Expand DownExpand Up		@@ -591,11 +597,7 @@ const key = '1' as BrandedKey;
		foo?.[key]?.trim();
		`,
		languageOptions: {
		parserOptions: {
		project: './tsconfig.noUncheckedIndexedAccess.json',
		projectService: false,
		tsconfigRootDir: getFixturesRootDir(),
		},
		parserOptions: optionsWithNoUncheckedIndexedAccess,
		},
		},
		{
Expand DownExpand Up		@@ -649,11 +651,7 @@ function Foo(outer: Outer, key: Foo): number \| undefined {
		}
		`,
		languageOptions: {
		parserOptions: {
		project: './tsconfig.noUncheckedIndexedAccess.json',
		projectService: false,
		tsconfigRootDir: getFixturesRootDir(),
		},
		parserOptions: optionsWithNoUncheckedIndexedAccess,
		},
		},
		{
Expand All		@@ -666,11 +664,51 @@ declare const key: Key;
		foo?.[key]?.trim();
		`,
		languageOptions: {
		parserOptions: {
		project: './tsconfig.noUncheckedIndexedAccess.json',
		projectService: false,
		tsconfigRootDir: getFixturesRootDir(),
		},
		parserOptions: optionsWithNoUncheckedIndexedAccess,
		},
		},
		{
		code: `
		type Foo = {
		key?: Record<string, { key: string }>;
		};
		declare const foo: Foo;
		foo.key?.someKey?.key;
		`,
		languageOptions: {
		parserOptions: optionsWithNoUncheckedIndexedAccess,
		},
		},
		{
		code: `
		type Foo = {
		key?: {
		[key: string]: () => void;
		};
		};
		declare const foo: Foo;
		foo.key?.value?.();
		`,
		languageOptions: {
		parserOptions: optionsWithNoUncheckedIndexedAccess,
		},
		},
		{
		code: `
		type A = {
		[name in Lowercase<string>]?: {
		[name in Lowercase<string>]: {
		a: 1;
		};
		};
		};

		declare const a: A;

		a.a?.a?.a;
		`,
		languageOptions: {
		parserOptions: optionsWithNoUncheckedIndexedAccess,
		},
		},
		`
Expand Down