Merge pull request #80 from Hack4Impact-UMD/zod-schema-refactor

Add Zod schemas to common; infer types from schemas; compose schemas in app

Author: rk234

app/.oxlintrc.json

@@ -116,6 +116,10 @@
         "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
         "@typescript-eslint/no-unsafe-function-type": "error",
         "@typescript-eslint/no-wrapper-object-types": "error",
+        "@typescript-eslint/consistent-type-assertions": "error",
+        "@typescript-eslint/no-non-null-assertion": "error",
+        "@typescript-eslint/no-unnecessary-type-assertion": "error",
+        "@typescript-eslint/no-unsafe-type-assertion": "error",
         "@typescript-eslint/prefer-as-const": "error",
         "@typescript-eslint/prefer-for-of": "warn",
         "@typescript-eslint/triple-slash-reference": "error",

app/src/components/auth/ReauthAlertDialog.tsx

@@ -40,7 +40,7 @@ export function ReauthAlertDialog({
       if (!auth.currentUser || !authCtx.authUser.email)
         throw new Error("not authenticated");
       await reauthenticateWithCredential(
-        auth.currentUser!,
+        auth.currentUser,
         EmailAuthProvider.credential(authCtx.authUser.email, pass),
       );
       setErr(false);

app/src/components/donor/home/ChildBlock.tsx

@@ -21,7 +21,7 @@ export function ChildBlock({ child }: { child: CommittedChild }) {
   const set = useCallback((id: string, patch: Partial<GiftFormState>) => {
     setGiftStates((p) => ({
       ...p,
-      [id]: { ...p[id]!, ...patch, changesSaved: false },
+      [id]: { ...p[id], ...patch, changesSaved: false },
     }));
   }, []);
 
@@ -55,9 +55,9 @@ export function ChildBlock({ child }: { child: CommittedChild }) {
     setGiftStates((p) => ({
       ...p,
       [id]: {
-        ...p[id]!,
+        ...p[id],
         changesSaved: true,
-        unclaimed: p[id]!.pendingUnclaim, // promote pending to actual
+        unclaimed: p[id]?.pendingUnclaim, // promote pending to actual
       },
     }));
   }, []);

app/src/components/donor/home/ChildDetailSection.tsx

@@ -62,7 +62,7 @@ export function ChildDetailSection({
             <GiftInformationCard
               key={gift.id}
               gift={gift}
-              state={giftStates[gift.id]!}
+              state={giftStates[gift.id]}
               onOrdered={() => onOrdered(gift.id)}
               onDelivered={() => onDelivered(gift.id)}
               onUndoDelivery={() => onUndoDelivery(gift.id)}

app/src/lib/formSchemas.ts

@@ -1,16 +1,9 @@
 import { z } from "zod";
+import { ChildStatusSchema } from "common";
 import type { ChildStatus } from "common";
 
 // Ordered to match display order in the form.
-export const CHILD_STATUS_VALUES = [
-  "recently_diagnosed_relapse",
-  "diagnosed_in_treatment_1yr+",
-  "recently_off_treatment",
-  "off_treatment_5yr+",
-  "sibling_in_treatment",
-  "bereaved_sibling",
-  "bereaved_sibling_5yr+",
-] as const satisfies ReadonlyArray<ChildStatus>;
+export const CHILD_STATUS_VALUES = ChildStatusSchema.options;
 
 export const CHILD_STATUS_LABELS: Record<ChildStatus, string> = {
   recently_diagnosed_relapse:

app/src/queries/publishedGifts.ts

@@ -9,9 +9,9 @@ const publishedGiftsQueries = createQueryKeys("publishedGifts", {
     queryKey: ["byDrive", driveId],
     queryFn: () => getPublishedGifts({ data: { driveId } }),
   }),
-  tableRowsByDrive: (driveId?: string) => ({
+  tableRowsByDrive: (driveId: string) => ({
     queryKey: ["tableRowsByDrive", driveId],
-    queryFn: () => getPublishedGiftsTableRows({ data: { driveId: driveId! } }),
+    queryFn: () => getPublishedGiftsTableRows({ data: { driveId } }),
   }),
 });
 

app/src/routes/_authenticated/staff/gifts.tsx

@@ -12,7 +12,7 @@ export const Route = createFileRoute("/_authenticated/staff/gifts")({
 function RouteComponent() {
   const { activeDriveId } = useDrive();
   const tableRowsByDriveQuery = publishedGiftsQueries.tableRowsByDrive(
-    activeDriveId ?? undefined,
+    activeDriveId ?? "",
   );
   const { data: tableRows = [], isLoading } = useQuery({
     ...tableRowsByDriveQuery,

app/src/routes/_authenticated/staff/route.tsx

@@ -62,8 +62,8 @@ function RouteComponent() {
               <main className="flex min-w-0 flex-1 flex-col">
                 <div className="w-full bg-accent border-b block md:hidden">
                   <SidebarTrigger
-                    openIcon={<XIcon />}
-                    closeIcon={<MenuIcon />}
+                    closeIcon={<XIcon />}
+                    openIcon={<MenuIcon />}
                   />
                 </div>
                 <div className="flex min-h-0 flex-1 flex-col p-4">

app/src/server/functions/cart.ts

@@ -32,9 +32,8 @@ export const getCartGiftsGroupedByFamily = createServerFn({ method: "GET" })
     );
 
     const gifts = giftDocs.flatMap((doc) => {
-      if (!doc.exists) return [];
-      const gift = doc.data()!;
-      if (!gift.active) return [];
+      const gift = doc.data();
+      if (!gift?.active) return [];
       return [
         {
           id: gift.id,
@@ -56,8 +55,8 @@ export const getCartGiftsGroupedByFamily = createServerFn({ method: "GET" })
 
     const familyById: Record<string, StorefrontFamily> = {};
     for (const doc of familyDocs) {
-      if (!doc.exists) continue;
-      const family = doc.data()!;
+      const family = doc.data();
+      if (!family) continue;
       familyById[family.id] = {
         id: family.id,
         contactName: family.contactName,