From 4566bfb129093b1a7398df6ad1e477c44e9f0e58 Mon Sep 17 00:00:00 2001 From: Abraham Guo Date: Thu, 4 Apr 2024 07:15:53 -0500 Subject: [PATCH 1/2] handle recommended=object --- .../src/components/RulesTable/index.tsx | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/website/src/components/RulesTable/index.tsx b/packages/website/src/components/RulesTable/index.tsx index 36f91a0ba22b..34849bcaaf09 100644 --- a/packages/website/src/components/RulesTable/index.tsx +++ b/packages/website/src/components/RulesTable/index.tsx @@ -2,6 +2,10 @@ import Link from '@docusaurus/Link'; import { useHistory } from '@docusaurus/router'; import type { RulesMeta } from '@site/rulesMeta'; import { useRulesMeta } from '@site/src/hooks/useRulesMeta'; +import type { + RuleMetaDataDocs, + RuleRecommendation, +} from '@typescript-eslint/utils/ts-eslint'; import clsx from 'clsx'; import React, { useMemo } from 'react'; @@ -31,6 +35,13 @@ function interpolateCode( return fragments.map((v, i) => (i % 2 === 0 ? v : {v})); } +function getActualRecommended({ + docs, +}: RulesMeta[number]): RuleRecommendation | undefined { + const recommended = docs?.recommended; + return typeof recommended === 'object' ? 'recommended' : recommended; +} + function RuleRow({ rule, }: { @@ -40,9 +51,8 @@ function RuleRow({ return null; } const { fixable, hasSuggestions, type, deprecated } = rule; - const { recommended, requiresTypeChecking, extendsBaseRule } = rule.docs; - const actualRecommended = - typeof recommended === 'object' ? 'recommended' : recommended; + const { requiresTypeChecking, extendsBaseRule } = rule.docs; + const actualRecommended = getActualRecommended(rule); const formatting = type === 'layout'; return ( @@ -171,14 +181,15 @@ export default function RulesTable(): React.JSX.Element { const relevantRules = useMemo( () => rules.filter(r => { + const actualRecommended = getActualRecommended(r); const opinions = [ - match(filters.recommended, r.docs?.recommended === 'recommended'), + match(filters.recommended, actualRecommended === 'recommended'), match( filters.strict, - r.docs?.recommended === 'recommended' || - r.docs?.recommended === 'strict', + actualRecommended === 'recommended' || + actualRecommended === 'strict', ), - match(filters.stylistic, r.docs?.recommended === 'stylistic'), + match(filters.stylistic, actualRecommended === 'stylistic'), match(filters.fixable, !!r.fixable), match(filters.suggestions, !!r.hasSuggestions), match(filters.typeInformation, !!r.docs?.requiresTypeChecking), From 3462e78e033ce9a83efc0bedffe99c44a62111d1 Mon Sep 17 00:00:00 2001 From: Abraham Guo Date: Thu, 4 Apr 2024 07:20:16 -0500 Subject: [PATCH 2/2] lint --- packages/website/src/components/RulesTable/index.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/website/src/components/RulesTable/index.tsx b/packages/website/src/components/RulesTable/index.tsx index 34849bcaaf09..43918d9208cf 100644 --- a/packages/website/src/components/RulesTable/index.tsx +++ b/packages/website/src/components/RulesTable/index.tsx @@ -2,10 +2,7 @@ import Link from '@docusaurus/Link'; import { useHistory } from '@docusaurus/router'; import type { RulesMeta } from '@site/rulesMeta'; import { useRulesMeta } from '@site/src/hooks/useRulesMeta'; -import type { - RuleMetaDataDocs, - RuleRecommendation, -} from '@typescript-eslint/utils/ts-eslint'; +import type { RuleRecommendation } from '@typescript-eslint/utils/ts-eslint'; import clsx from 'clsx'; import React, { useMemo } from 'react'; pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy