Clean up types for cars by vehicle type

sgcarstrends · Nov 22, 2024 · d5f8386 · d5f8386
1 parent f5a955e
commit d5f8386
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/config/index.ts b/config/index.ts
@@ -1,7 +1,7 @@
 import { Battery, Droplet, Fuel, Zap } from "lucide-react";
 import { VEHICLE_TYPE_MAP } from "@/constants";
 import { slugify } from "@/utils/slugify";
-import type { APP_ENV, LinkItem } from "@/types";
+import type { AppEnv, LinkItem, VehicleType } from "@/types";
 
 export const DOMAIN_NAME = "sgcarstrends.com";
 const API_VERSION = "v1";
@@ -84,11 +84,14 @@ export const VEHICLE_TYPE_LINKS: LinkItem[] = [
   { label: "Sports Utility Vehicle" },
   { label: "Coupe/Convertible" },
 ]
-  .map((link) => ({
-    ...link,
-    label: VEHICLE_TYPE_MAP[link.label] || link.label,
-    href: `/cars/vehicle-types/${slugify(link.label)}`,
-  }))
+  .map((link) => {
+    const label = link.label as VehicleType;
+    return {
+      ...link,
+      label: VEHICLE_TYPE_MAP[label] || label,
+      href: `/cars/vehicle-types/${slugify(link.label)}`,
+    };
+  })
   .sort((a, b) => a.label.localeCompare(b.label));
 
 export const COE_LINKS: LinkItem[] = [

diff --git a/constants/index.ts b/constants/index.ts
@@ -1,4 +1,4 @@
-import type { VEHICLE_TYPE } from "@/types";
+import type { VehicleType } from "@/types";
 
 export const CARS = {
   TABLE: {
@@ -21,7 +21,7 @@ export const MAKE = {
   },
 };
 
-export const VEHICLE_TYPE_MAP: Record<string, string> = {
+export const VEHICLE_TYPE_MAP: Partial<Record<VehicleType, string>> = {
   "Multi-purpose Vehicle": "MPV",
   "Multi-purpose Vehicle/Station-wagon": "MPV",
   "Sports Utility Vehicle": "SUV",

diff --git a/types/index.ts b/types/index.ts
@@ -1,7 +1,7 @@
 import { FUEL_TYPE } from "@/config";
 import type { LucideIcon } from "lucide-react";
 
-export type VEHICLE_TYPE =
+export type VehicleType =
   | "Coupe/ Convertible"
   | "Hatchback"
   | "Multi-purpose Vehicle"
@@ -16,7 +16,7 @@ export interface Car {
   make: string;
   importer_type?: string;
   fuel_type: FUEL_TYPE;
-  vehicle_type: VEHICLE_TYPE;
+  vehicle_type: VehicleType;
   number: number;
   selected?: boolean;
 }