Changes all documents to have an explicit type

2025-06-27 21:58:58 -07:00
parent 611eaca5b6
commit c00eb1d965
29 changed files with 309 additions and 363 deletions
--- a/src/components/documents/DocumentEditForm.tsx
+++ b/src/components/documents/DocumentEditForm.tsx
@@ -1,13 +1,4 @@
-import {
-  isLocation,
-  isMonster,
-  isNpc,
-  isScene,
-  isSecret,
-  isSession,
-  isTreasure,
-  type AnyDocument,
-} from "@/lib/types";
+import { type AnyDocument } from "@/lib/types";
 import { LocationEditForm } from "./location/LocationEditForm";
 import { MonsterEditForm } from "./monsters/MonsterEditForm";
 import { NpcEditForm } from "./npc/NpcEditForm";
@@ -16,41 +7,24 @@ import { SecretEditForm } from "./secret/SecretEditForm";
 import { SessionEditForm } from "./session/SessionEditForm";
 import { TreasureEditForm } from "./treasure/TreasureEditForm";

-function assertUnreachable(_x: never): never {
-  throw new Error("DocumentForm switch is not exhaustive");
-}
-
 /**
 * Renders a form for any document type depending on the relationship.
 */
 export const DocumentEditForm = ({ document }: { document: AnyDocument }) => {
-  if (isLocation(document)) {
-    return <LocationEditForm location={document} />;
+  switch (document.type) {
+    case "location":
+      return <LocationEditForm location={document} />;
+    case "monster":
+      return <MonsterEditForm monster={document} />;
+    case "npc":
+      return <NpcEditForm npc={document} />;
+    case "scene":
+      return <SceneEditForm scene={document} />;
+    case "secret":
+      return <SecretEditForm secret={document} />;
+    case "session":
+      return <SessionEditForm session={document} />;
+    case "treasure":
+      return <TreasureEditForm treasure={document} />;
  }
-
-  if (isMonster(document)) {
-    return <MonsterEditForm monster={document} />;
-  }
-
-  if (isNpc(document)) {
-    return <NpcEditForm npc={document} />;
-  }
-
-  if (isScene(document)) {
-    return <SceneEditForm scene={document} />;
-  }
-
-  if (isSecret(document)) {
-    return <SecretEditForm secret={document} />;
-  }
-
-  if (isSession(document)) {
-    return <SessionEditForm session={document} />;
-  }
-
-  if (isTreasure(document)) {
-    return <TreasureEditForm treasure={document} />;
-  }
-
-  return assertUnreachable(document);
 };
--- a/src/components/documents/DocumentPrintRow.tsx
+++ b/src/components/documents/DocumentPrintRow.tsx
@@ -1,64 +1,33 @@
 // DocumentRow.tsx
 // Generic row component for displaying any document type.
-import {
-  isLocation,
-  isMonster,
-  isNpc,
-  isScene,
-  isSecret,
-  isSession,
-  isTreasure,
-  type Document,
-} from "@/lib/types";
+import { type AnyDocument } from "@/lib/types";
 import { LocationPrintRow } from "./location/LocationPrintRow";
 import { MonsterPrintRow } from "./monsters/MonsterPrintRow";
-import { TreasurePrintRow } from "./treasure/TreasurePrintRow";
-import { SecretPrintRow } from "./secret/SecretPrintRow";
 import { NpcPrintRow } from "./npc/NpcPrintRow";
 import { ScenePrintRow } from "./scene/ScenePrintRow";
+import { SecretPrintRow } from "./secret/SecretPrintRow";
 import { SessionPrintRow } from "./session/SessionPrintRow";
+import { TreasurePrintRow } from "./treasure/TreasurePrintRow";

 /**
 * Renders a row for any document type. Prioritizes Session, then Secret, then falls back to ID and creation time.
 * If rendering a SecretRow, uses the provided session prop if available.
 */
-export const DocumentPrintRow = ({ document }: { document: Document }) => {
-  if (isLocation(document)) {
-    return <LocationPrintRow location={document} />;
+export const DocumentPrintRow = ({ document }: { document: AnyDocument }) => {
+  switch (document.type) {
+    case "location":
+      return <LocationPrintRow location={document} />;
+    case "monster":
+      return <MonsterPrintRow monster={document} />;
+    case "npc":
+      return <NpcPrintRow npc={document} />;
+    case "scene":
+      return <ScenePrintRow scene={document} />;
+    case "secret":
+      return <SecretPrintRow secret={document} />;
+    case "session":
+      return <SessionPrintRow session={document} />;
+    case "treasure":
+      return <TreasurePrintRow treasure={document} />;
  }
-
-  if (isMonster(document)) {
-    return <MonsterPrintRow monster={document} />;
-  }
-
-  if (isNpc(document)) {
-    return <NpcPrintRow npc={document} />;
-  }
-
-  if (isSession(document)) {
-    return <SessionPrintRow session={document} />;
-  }
-
-  if (isSecret(document)) {
-    return <SecretPrintRow secret={document} />;
-  }
-
-  if (isScene(document)) {
-    return <ScenePrintRow scene={document} />;
-  }
-
-  if (isTreasure(document)) {
-    return <TreasurePrintRow treasure={document} />;
-  }
-
-  // Fallback: show ID and creation time
-  return (
-    <div>
-      <div className="font-semibold text-lg text-slate-300">
-        Unrecognized Document
-      </div>
-      <div className="text-slate-400 text-sm">ID: {document.id}</div>
-      <div className="text-slate-400 text-sm">Created: {document.created}</div>
-    </div>
-  );
 };
--- a/src/components/documents/DocumentRow.tsx
+++ b/src/components/documents/DocumentRow.tsx
@@ -1,17 +1,7 @@
 // DocumentRow.tsx
 // Generic row component for displaying any document type.
 import { SecretToggleRow } from "@/components/documents/secret/SecretToggleRow";
-import {
-  isLocation,
-  isMonster,
-  isNpc,
-  isScene,
-  isSecret,
-  isSession,
-  isTreasure,
-  type Document,
-  type Session,
-} from "@/lib/types";
+import { type AnyDocument, type Session } from "@/lib/types";
 import { BasicRow } from "./BasicRow";
 import { TreasureToggleRow } from "./treasure/TreasureToggleRow";

@@ -23,63 +13,47 @@ export const DocumentRow = ({
  document,
  session,
 }: {
-  document: Document;
+  document: AnyDocument;
  session?: Session;
 }) => {
-  if (isLocation(document)) {
-    return (
-      <BasicRow
-        doc={document}
-        title={document.data.location.name}
-        description={document.data.location.description}
-      />
-    );
-  }
+  switch (document.type) {
+    case "location":
+      return (
+        <BasicRow
+          doc={document}
+          title={document.data.name}
+          description={document.data.description}
+        />
+      );

-  if (isMonster(document)) {
-    return <BasicRow doc={document} title={document.data.monster.name} />;
-  }
+    case "monster":
+      return <BasicRow doc={document} title={document.data.name} />;

-  if (isNpc(document)) {
-    return (
-      <BasicRow
-        doc={document}
-        title={document.data.npc.name}
-        description={document.data.npc.description}
-      />
-    );
-  }
+    case "npc":
+      return (
+        <BasicRow
+          doc={document}
+          title={document.data.name}
+          description={document.data.description}
+        />
+      );

-  if (isSession(document)) {
-    return (
-      <BasicRow
-        doc={document}
-        title={document.created}
-        description={document.data.session.strongStart}
-      />
-    );
-  }
+    case "session":
+      return (
+        <BasicRow
+          doc={document}
+          title={document.created}
+          description={document.data.strongStart}
+        />
+      );

-  if (isSecret(document)) {
-    return <SecretToggleRow secret={document} session={session} />;
-  }
+    case "secret":
+      return <SecretToggleRow secret={document} session={session} />;

-  if (isScene(document)) {
-    return <BasicRow doc={document} title={document.data.scene.text} />;
-  }
+    case "scene":
+      return <BasicRow doc={document} title={document.data.text} />;

-  if (isTreasure(document)) {
-    return <TreasureToggleRow treasure={document} session={session} />;
+    case "treasure":
+      return <TreasureToggleRow treasure={document} session={session} />;
  }
-
-  // Fallback: show ID and creation time
-  return (
-    <div>
-      <div className="font-semibold text-lg text-slate-300">
-        Unrecognized Document
-      </div>
-      <div className="text-slate-400 text-sm">ID: {document.id}</div>
-      <div className="text-slate-400 text-sm">Created: {document.created}</div>
-    </div>
-  );
 };
--- a/src/components/documents/location/LocationEditForm.tsx
+++ b/src/components/documents/location/LocationEditForm.tsx
@@ -10,10 +10,7 @@ export const LocationEditForm = ({ location }: { location: Location }) => {
    await pb.collection("documents").update(location.id, {
      data: {
        ...location.data,
-        location: {
-          ...location.data.location,
-          name,
-        },
+        name,
      },
    });
  }
@@ -22,10 +19,7 @@ export const LocationEditForm = ({ location }: { location: Location }) => {
    await pb.collection("documents").update(location.id, {
      data: {
        ...location.data,
-        location: {
-          ...location.data.location,
-          description,
-        },
+        description,
      },
    });
  }
@@ -34,11 +28,11 @@ export const LocationEditForm = ({ location }: { location: Location }) => {
    <div className="">
      <AutoSaveTextarea
        multiline={false}
-        value={location.data.location.name}
+        value={location.data.name}
        onSave={saveLocationName}
      />
      <AutoSaveTextarea
-        value={location.data.location.description}
+        value={location.data.description}
        onSave={saveLocationDescription}
      />
    </div>
--- a/src/components/documents/location/LocationPrintRow.tsx
+++ b/src/components/documents/location/LocationPrintRow.tsx
@@ -6,8 +6,8 @@ import type { Location } from "@/lib/types";
 export const LocationPrintRow = ({ location }: { location: Location }) => {
  return (
    <li>
-      <h4>{location.data.location.name}</h4>
-      <p>{location.data.location.description}</p>
+      <h4>{location.data.name}</h4>
+      <p>{location.data.description}</p>
    </li>
  );
 };
--- a/src/components/documents/location/NewLocationForm.tsx
+++ b/src/components/documents/location/NewLocationForm.tsx
@@ -25,11 +25,10 @@ export const NewLocationForm = ({
    try {
      const locationDoc: Location = await pb.collection("documents").create({
        campaign,
+        type: "location",
        data: {
-          location: {
-            name,
-            description,
-          },
+          name,
+          description,
        },
      });
      setName("");
--- a/src/components/documents/monsters/MonsterEditForm.tsx
+++ b/src/components/documents/monsters/MonsterEditForm.tsx
@@ -10,10 +10,7 @@ export const MonsterEditForm = ({ monster }: { monster: Monster }) => {
    await pb.collection("documents").update(monster.id, {
      data: {
        ...monster.data,
-        monster: {
-          ...monster.data.monster,
-          name,
-        },
+        name,
      },
    });
  }
@@ -22,7 +19,7 @@ export const MonsterEditForm = ({ monster }: { monster: Monster }) => {
    <div className="">
      <AutoSaveTextarea
        multiline={false}
-        value={monster.data.monster.name}
+        value={monster.data.name}
        onSave={saveMonsterName}
      />
    </div>
--- a/src/components/documents/monsters/MonsterPrintRow.tsx
+++ b/src/components/documents/monsters/MonsterPrintRow.tsx
@@ -4,5 +4,5 @@ import type { Monster } from "@/lib/types";
 * Renders an editable monster row
 */
 export const MonsterPrintRow = ({ monster }: { monster: Monster }) => {
-  return <li>{monster.data.monster.name}</li>;
+  return <li>{monster.data..name}</li>;
 };
--- a/src/components/documents/monsters/NewMonsterForm.tsx
+++ b/src/components/documents/monsters/NewMonsterForm.tsx
@@ -25,11 +25,10 @@ export const NewMonsterForm = ({
    try {
      const monsterDoc: Monster = await pb.collection("documents").create({
        campaign,
+        type: "monster",
        data: {
-          monster: {
-            name,
-            description,
-          },
+          name,
+          description,
        },
      });
      setName("");
--- a/src/components/documents/npc/NewNpcForm.tsx
+++ b/src/components/documents/npc/NewNpcForm.tsx
@@ -25,11 +25,10 @@ export const NewNpcForm = ({
    try {
      const npcDoc: Npc = await pb.collection("documents").create({
        campaign,
+        type: "npc",
        data: {
-          npc: {
-            name,
-            description,
-          },
+          name,
+          description,
        },
      });
      setName("");
--- a/src/components/documents/npc/NpcEditForm.tsx
+++ b/src/components/documents/npc/NpcEditForm.tsx
@@ -10,10 +10,7 @@ export const NpcEditForm = ({ npc }: { npc: Npc }) => {
    await pb.collection("documents").update(npc.id, {
      data: {
        ...npc.data,
-        npc: {
-          ...npc.data.npc,
-          name,
-        },
+        name,
      },
    });
  }
@@ -22,10 +19,7 @@ export const NpcEditForm = ({ npc }: { npc: Npc }) => {
    await pb.collection("documents").update(npc.id, {
      data: {
        ...npc.data,
-        npc: {
-          ...npc.data.npc,
-          description,
-        },
+        description,
      },
    });
  }
@@ -34,11 +28,11 @@ export const NpcEditForm = ({ npc }: { npc: Npc }) => {
    <div className="">
      <AutoSaveTextarea
        multiline={false}
-        value={npc.data.npc.name}
+        value={npc.data.name}
        onSave={saveNpcName}
      />
      <AutoSaveTextarea
-        value={npc.data.npc.description}
+        value={npc.data.description}
        onSave={saveNpcDescription}
      />
    </div>
--- a/src/components/documents/npc/NpcPrintRow.tsx
+++ b/src/components/documents/npc/NpcPrintRow.tsx
@@ -6,8 +6,8 @@ import type { Npc } from "@/lib/types";
 export const NpcPrintRow = ({ npc }: { npc: Npc }) => {
  return (
    <li className="">
-      <h4>{npc.data.npc.name}</h4>
-      <p>{npc.data.npc.description}</p>
+      <h4>{npc.data.name}</h4>
+      <p>{npc.data.description}</p>
    </li>
  );
 };
--- a/src/components/documents/scene/NewSceneForm.tsx
+++ b/src/components/documents/scene/NewSceneForm.tsx
@@ -26,10 +26,9 @@ export const NewSceneForm = ({
    try {
      const sceneDoc: Scene = await pb.collection("documents").create({
        campaign,
+        type: "scene",
        data: {
-          scene: {
-            text,
-          },
+          text,
        },
      });
      setText("");
--- a/src/components/documents/scene/SceneEditForm.tsx
+++ b/src/components/documents/scene/SceneEditForm.tsx
@@ -13,9 +13,7 @@ export const SceneEditForm = ({ scene }: { scene: Scene }) => {
    await pb.collection("documents").update(scene.id, {
      data: {
        ...scene.data,
-        scene: {
-          text,
-        },
+        text,
      },
    });
    queryClient.invalidateQueries({
@@ -25,7 +23,7 @@ export const SceneEditForm = ({ scene }: { scene: Scene }) => {

  return (
    <div className="">
-      <AutoSaveTextarea value={scene.data.scene.text} onSave={saveScene} />
+      <AutoSaveTextarea value={scene.data.text} onSave={saveScene} />
    </div>
  );
 };
--- a/src/components/documents/scene/ScenePrintRow.tsx
+++ b/src/components/documents/scene/ScenePrintRow.tsx
@@ -4,5 +4,5 @@ import type { Scene } from "@/lib/types";
 * Renders an editable scene row
 */
 export const ScenePrintRow = ({ scene }: { scene: Scene }) => {
-  return <li className="">{scene.data.scene.text}</li>;
+  return <li className="">{scene.data.text}</li>;
 };
--- a/src/components/documents/secret/NewSecretForm.tsx
+++ b/src/components/documents/secret/NewSecretForm.tsx
@@ -26,11 +26,10 @@ export const NewSecretForm = ({
    try {
      const secretDoc: Secret = await pb.collection("documents").create({
        campaign,
+        type: "secret",
        data: {
-          secret: {
-            text: newSecret,
-            discovered: false,
-          },
+          text: newSecret,
+          discovered: false,
        },
      });
      setNewSecret("");
--- a/src/components/documents/secret/SecretEditForm.tsx
+++ b/src/components/documents/secret/SecretEditForm.tsx
@@ -28,10 +28,7 @@ export const SecretEditForm = ({
      await pb.collection("documents").update(secret.id, {
        data: {
          ...secret.data,
-          secret: {
-            ...(secret.data as any).secret,
-            discovered: newChecked,
-          },
+          discovered: newChecked,
        },
      });
      if (session || !newChecked) {
@@ -62,10 +59,7 @@ export const SecretEditForm = ({
    await pb.collection("documents").update(secret.id, {
      data: {
        ...secret.data,
-        secret: {
-          ...secret.data.secret,
-          text,
-        },
+        text,
      },
    });
  }
@@ -82,7 +76,7 @@ export const SecretEditForm = ({
      />
      <AutoSaveTextarea
        multiline={false}
-        value={secret.data.secret.text}
+        value={secret.data.text}
        onSave={saveText}
      />
    </div>
--- a/src/components/documents/secret/SecretToggleRow.tsx
+++ b/src/components/documents/secret/SecretToggleRow.tsx
@@ -68,11 +68,7 @@ export const SecretToggleRow = ({
        aria-label="Discovered"
        disabled={loading}
      />
-      <span>
-        {(secret.data as any)?.secret?.text || (
-          <span className="italic text-slate-400">(No secret text)</span>
-        )}
-      </span>
+      <span>{secret.data.text}</span>
    </div>
  );
 };
--- a/src/components/documents/session/SessionEditForm.tsx
+++ b/src/components/documents/session/SessionEditForm.tsx
@@ -7,10 +7,7 @@ export const SessionEditForm = ({ session }: { session: Session }) => {
    await pb.collection("documents").update(session.id, {
      data: {
        ...session.data,
-        session: {
-          ...session.data.session,
-          strongStart,
-        },
+        strongStart,
      },
    });
  }
@@ -19,7 +16,7 @@ export const SessionEditForm = ({ session }: { session: Session }) => {
    <form>
      <h3 className="text-lg font-bold mb-4 text-slate-100">Strong Start</h3>
      <AutoSaveTextarea
-        value={session.data.session.strongStart}
+        value={session.data.strongStart}
        onSave={saveStrongStart}
        placeholder="Enter a strong start for this session..."
        aria-label="Strong Start"
--- a/src/components/documents/session/SessionPrintRow.tsx
+++ b/src/components/documents/session/SessionPrintRow.tsx
@@ -4,7 +4,7 @@ export const SessionPrintRow = ({ session }: { session: Session }) => {
  return (
    <div>
      <h3 className="text-lg font-bold text-slate-600">StrongStart</h3>
-      <div className="">{session.data.session.strongStart}</div>
+      <div className="">{session.data.strongStart}</div>
    </div>
  );
 };
--- a/src/components/documents/session/SessionRow.tsx
+++ b/src/components/documents/session/SessionRow.tsx
@@ -12,7 +12,7 @@ export const SessionRow = ({ session }: { session: Session }) => {
      >
        <FormattedDate date={session.created} />
      </Link>
-      <div className="">{session.data.session.strongStart}</div>
+      <div className="">{session.data.strongStart}</div>
    </div>
  );
 };
--- a/src/components/documents/treasure/NewTreasureForm.tsx
+++ b/src/components/documents/treasure/NewTreasureForm.tsx
@@ -26,11 +26,10 @@ export const NewTreasureForm = ({
    try {
      const treasureDoc: Treasure = await pb.collection("documents").create({
        campaign,
+        type: "treasure",
        data: {
-          treasure: {
-            text: newTreasure,
-            discovered: false,
-          },
+          text: newTreasure,
+          discovered: false,
        },
      });
      setNewTreasure("");
--- a/src/components/documents/treasure/TreasureEditForm.tsx
+++ b/src/components/documents/treasure/TreasureEditForm.tsx
@@ -62,10 +62,7 @@ export const TreasureEditForm = ({
    await pb.collection("documents").update(treasure.id, {
      data: {
        ...treasure.data,
-        treasure: {
-          ...treasure.data.treasure,
-          text,
-        },
+        text,
      },
    });
  }
@@ -82,7 +79,7 @@ export const TreasureEditForm = ({
      />
      <AutoSaveTextarea
        multiline={false}
-        value={treasure.data.treasure.text}
+        value={treasure.data.text}
        onSave={saveText}
      />
    </div>
--- a/src/components/documents/treasure/TreasureToggleRow.tsx
+++ b/src/components/documents/treasure/TreasureToggleRow.tsx
@@ -68,11 +68,7 @@ export const TreasureToggleRow = ({
        aria-label="Discovered"
        disabled={loading}
      />
-      <span>
-        {(treasure.data as any)?.treasure?.text || (
-          <span className="italic text-slate-400">(No treasure text)</span>
-        )}
-      </span>
+      <span>{treasure.data.text}</span>
    </div>
  );
 };