more types cleanup

Author: bmuenzenmeyer

apps/site/components/EOL/EOLModal/index.tsx

@@ -5,17 +5,12 @@ import type { FC } from 'react';
 import UnknownSeveritySection from '#site/components/EOL/UnknownSeveritySection';
 import VulnerabilitiesTable from '#site/components/EOL/VulnerabilitiesTable';
 import { SEVERITY_ORDER } from '#site/next.constants.mjs';
-import type { ModalProps, NodeRelease } from '#site/types';
-import type { Vulnerability } from '#site/types/vulnerabilities';
-
-type EOLModalData = {
-  release: NodeRelease;
-  vulnerabilities: Array<Vulnerability>;
-};
-
-type KnownVulnerability = Vulnerability & {
-  severity: (typeof SEVERITY_ORDER)[number];
-};
+import type { ModalProps } from '#site/types';
+import type {
+  EOLModalData,
+  KnownVulnerability,
+  Vulnerability,
+} from '#site/types/vulnerabilities';
 
 const EOLModal: FC<ModalProps> = ({ open, closeModal, data }) => {
   const { release, vulnerabilities } = data as EOLModalData;

apps/site/components/EOL/VulnerabilityChips/Chip/index.tsx

@@ -3,14 +3,10 @@ import { useTranslations } from 'next-intl';
 import type { FC } from 'react';
 
 import { SEVERITY_KIND_MAP } from '#site/next.constants.mjs';
+import type { VulnerabilityChipProps } from '#site/types';
 
 import styles from './index.module.css';
 
-type VulnerabilityChipProps = {
-  severity: keyof typeof SEVERITY_KIND_MAP;
-  count?: number;
-};
-
 const VulnerabilityChip: FC<VulnerabilityChipProps> = ({
   severity,
   count = 0,

apps/site/components/EOL/VulnerabilityChips/index.tsx

@@ -2,11 +2,7 @@ import type { FC } from 'react';
 
 import VulnerabilityChip from '#site/components/EOL/VulnerabilityChips/Chip';
 import { SEVERITY_ORDER } from '#site/next.constants.mjs';
-import type { Vulnerability } from '#site/types/vulnerabilities';
-
-type VulnerabilityChipsProps = {
-  vulnerabilities: Array<Vulnerability>;
-};
+import type { VulnerabilityChipsProps } from '#site/types';
 
 const VulnerabilityChips: FC<VulnerabilityChipsProps> = ({
   vulnerabilities,

apps/site/types/index.ts

@@ -14,3 +14,4 @@ export * from './calendar';
 export * from './author';
 export * from './download';
 export * from './userAgent';
+export * from './vulnerabilities';

apps/site/types/vulnerabilities.ts

@@ -1,3 +1,7 @@
+import type { SEVERITY_ORDER } from '#site/next.constants.mjs';
+import type { NodeRelease } from '#site/types';
+
+export type Severity = 'unknown' | 'low' | 'medium' | 'high' | 'critical';
 export interface Vulnerability {
   cve: Array<string>;
   ref?: string;
@@ -6,9 +10,27 @@ export interface Vulnerability {
   description: string;
   overview: string;
   affectedEnvironments: Array<string>;
-  severity: 'critical' | 'high' | 'medium' | 'low' | 'unknown';
+  severity: Severity;
 }
 
 export interface GroupedVulnerabilities {
   [majorVersion: string]: Array<Vulnerability>;
 }
+
+export type VulnerabilityChipsProps = {
+  vulnerabilities: Array<Vulnerability>;
+};
+
+export type VulnerabilityChipProps = {
+  severity: Severity;
+  count?: number;
+};
+
+export type EOLModalData = {
+  release: NodeRelease;
+  vulnerabilities: Array<Vulnerability>;
+};
+
+export type KnownVulnerability = Vulnerability & {
+  severity: (typeof SEVERITY_ORDER)[number];
+};