refactor(media): unify use-case I/O schemas + presenter + feature error map

Per Plan 9 (spec R1-R28):
- Use cases: input + output schemas (getMedia, listMedia); deleteMedia
  has input schema only (void output, R12 — no presenter).
- Controllers: unknown input + identity presenter on getMedia/listMedia;
  Promise<void> on deleteMedia.
- New integrations/api/procedures.ts with mediaProcedure
  ([InputParseError → BAD_REQUEST], [MediaNotFoundError → NOT_FOUND]).
- Router uses mediaProcedure + .input(xInputSchema).
- src/index.ts exports schemas + types; src/ui/index.ts placeholder
  (media has no queries today); package.json adds ./ui subpath.
- R25 + R26 tests added.

Refactor log: §1, §2, §3.1, §3.2, §3.3, §5.1, §5.2, §6.1, §6.2
Spec: R1–R6, R8–R15, R18–R20, R22–R26

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

packages/media/package.json

@@ -5,6 +5,7 @@
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
+    "./ui": "./src/ui/index.ts",
     "./cms": "./src/integrations/cms/index.ts",
     "./api": "./src/integrations/api/index.ts",
     "./di/bind-production": "./src/di/bind-production.ts"

packages/media/src/application/use-cases/delete-media.use-case.ts

@@ -1,11 +1,20 @@
+import { z } from "zod";
+
 import { MediaNotFoundError } from "../../entities/errors/media";
 import type { IMediaRepository } from "../repositories/media.repository.interface";
 
+// ── Input ────────────────────────────────────────────────────────────────
+export const deleteMediaInputSchema = z.object({ id: z.string().min(1) }).strict();
+export type DeleteMediaInput = z.infer<typeof deleteMediaInputSchema>;
+
+// No output schema — use case returns void.
+
+// ── Use case ─────────────────────────────────────────────────────────────
 export type IDeleteMediaUseCase = ReturnType<typeof deleteMediaUseCase>;
 
 export const deleteMediaUseCase =
   (mediaRepository: IMediaRepository) =>
-  async (input: { id: string }): Promise<void> => {
+  async (input: DeleteMediaInput): Promise<void> => {
     const existing = await mediaRepository.getMedia(input.id);
     if (!existing) {
       throw new MediaNotFoundError(`Media with id "${input.id}" not found`);

packages/media/src/application/use-cases/get-media.use-case.test.ts

@@ -1,5 +1,6 @@
 import { describe, it, expect } from "vitest";
-import { getMediaUseCase } from "@/application/use-cases/get-media.use-case";
+import { ZodError } from "zod";
+import { getMediaUseCase, getMediaOutputSchema } from "@/application/use-cases/get-media.use-case";
 import { MockMediaRepository } from "@/infrastructure/repositories/media.repository.mock";
 import { MediaNotFoundError } from "@/entities/errors/media";
 import { mediaFactory } from "@/__factories__/media.factory";
@@ -23,4 +24,18 @@ describe("getMediaUseCase", () => {
 
     await expect(useCase({ id: "missing" })).rejects.toThrow(MediaNotFoundError);
   });
+
+  it("R25 — parses valid output without error", async () => {
+    const validMedia = mediaFactory.build({ id: "m-r25" });
+    expect(() => getMediaOutputSchema.parse(validMedia)).not.toThrow();
+  });
+
+  it("R25 — throws ZodError when repository returns malformed media", async () => {
+    const repo = new MockMediaRepository();
+    // Store a malformed object (missing required fields) via type cast
+    await repo._store({ id: "bad", alt: "alt", url: "u" } as never);
+
+    const useCase = getMediaUseCase(repo);
+    await expect(useCase({ id: "bad" })).rejects.toBeInstanceOf(ZodError);
+  });
 });

packages/media/src/application/use-cases/get-media.use-case.ts

@@ -1,15 +1,26 @@
+import { z } from "zod";
+
 import { MediaNotFoundError } from "../../entities/errors/media";
-import type { Media } from "../../entities/models/media";
+import { mediaSchema } from "../../entities/models/media";
 import type { IMediaRepository } from "../repositories/media.repository.interface";
 
+// ── Input ────────────────────────────────────────────────────────────────
+export const getMediaInputSchema = z.object({ id: z.string().min(1) }).strict();
+export type GetMediaInput = z.infer<typeof getMediaInputSchema>;
+
+// ── Output ───────────────────────────────────────────────────────────────
+export const getMediaOutputSchema = mediaSchema;
+export type GetMediaOutput = z.infer<typeof getMediaOutputSchema>;
+
+// ── Use case ─────────────────────────────────────────────────────────────
 export type IGetMediaUseCase = ReturnType<typeof getMediaUseCase>;
 
 export const getMediaUseCase =
   (mediaRepository: IMediaRepository) =>
-  async (input: { id: string }): Promise<Media> => {
+  async (input: GetMediaInput): Promise<GetMediaOutput> => {
     const media = await mediaRepository.getMedia(input.id);
     if (!media) {
       throw new MediaNotFoundError(`Media with id "${input.id}" not found`);
     }
-    return media;
+    return getMediaOutputSchema.parse(media);
   };

packages/media/src/application/use-cases/list-media.use-case.test.ts

@@ -1,5 +1,6 @@
 import { describe, it, expect } from "vitest";
-import { listMediaUseCase } from "@/application/use-cases/list-media.use-case";
+import { ZodError } from "zod";
+import { listMediaUseCase, listMediaOutputSchema } from "@/application/use-cases/list-media.use-case";
 import { MockMediaRepository } from "@/infrastructure/repositories/media.repository.mock";
 import { mediaFactory } from "@/__factories__/media.factory";
 
@@ -7,7 +8,7 @@ describe("listMediaUseCase", () => {
   it("returns empty array when no media exists", async () => {
     const repo = new MockMediaRepository();
     const useCase = listMediaUseCase(repo);
-    const result = await useCase();
+    const result = await useCase({});
     expect(result).toHaveLength(0);
   });
 
@@ -17,7 +18,7 @@ describe("listMediaUseCase", () => {
     await repo._store(mediaFactory.build());
 
     const useCase = listMediaUseCase(repo);
-    const result = await useCase();
+    const result = await useCase({});
     expect(result).toHaveLength(2);
   });
 
@@ -31,4 +32,18 @@ describe("listMediaUseCase", () => {
     const result = await useCase({ limit: 2, offset: 1 });
     expect(result).toHaveLength(2);
   });
+
+  it("R25 — parses valid output without error", async () => {
+    const items = [mediaFactory.build(), mediaFactory.build()];
+    expect(() => listMediaOutputSchema.parse(items)).not.toThrow();
+  });
+
+  it("R25 — throws ZodError when repository returns malformed items", async () => {
+    const repo = new MockMediaRepository();
+    // Store a malformed object (missing required fields)
+    await repo._store({ id: "bad", alt: "alt", url: "u" } as never);
+
+    const useCase = listMediaUseCase(repo);
+    await expect(useCase({})).rejects.toBeInstanceOf(ZodError);
+  });
 });

packages/media/src/application/use-cases/list-media.use-case.ts

@@ -1,10 +1,27 @@
-import type { Media } from "../../entities/models/media";
+import { z } from "zod";
+
+import { mediaSchema } from "../../entities/models/media";
 import type { IMediaRepository } from "../repositories/media.repository.interface";
 
+// ── Input ────────────────────────────────────────────────────────────────
+export const listMediaInputSchema = z
+  .object({
+    limit: z.number().int().positive().optional(),
+    offset: z.number().int().nonnegative().optional(),
+  })
+  .strict();
+export type ListMediaInput = z.infer<typeof listMediaInputSchema>;
+
+// ── Output ───────────────────────────────────────────────────────────────
+export const listMediaOutputSchema = z.array(mediaSchema);
+export type ListMediaOutput = z.infer<typeof listMediaOutputSchema>;
+
+// ── Use case ─────────────────────────────────────────────────────────────
 export type IListMediaUseCase = ReturnType<typeof listMediaUseCase>;
 
 export const listMediaUseCase =
   (mediaRepository: IMediaRepository) =>
-  async (opts?: { limit?: number; offset?: number }): Promise<Media[]> => {
-    return mediaRepository.listMedia(opts);
+  async (input: ListMediaInput): Promise<ListMediaOutput> => {
+    const result = await mediaRepository.listMedia(input);
+    return listMediaOutputSchema.parse(result);
   };

packages/media/src/index.ts

@@ -2,3 +2,29 @@ export type { Media } from "./entities/models/media";
 export { MediaNotFoundError } from "./entities/errors/media";
 export { InputParseError } from "./entities/errors/common";
 export type { MediaRouter } from "./integrations/api/router";
+
+// Use case schemas + types (Plan 9 R18)
+export {
+  getMediaInputSchema,
+  getMediaOutputSchema,
+  type GetMediaInput,
+  type GetMediaOutput,
+  type IGetMediaUseCase,
+} from "./application/use-cases/get-media.use-case";
+export {
+  listMediaInputSchema,
+  listMediaOutputSchema,
+  type ListMediaInput,
+  type ListMediaOutput,
+  type IListMediaUseCase,
+} from "./application/use-cases/list-media.use-case";
+export {
+  deleteMediaInputSchema,
+  type DeleteMediaInput,
+  type IDeleteMediaUseCase,
+} from "./application/use-cases/delete-media.use-case";
+
+// Controller type aliases
+export type { IGetMediaController } from "./interface-adapters/controllers/get-media.controller";
+export type { IListMediaController } from "./interface-adapters/controllers/list-media.controller";
+export type { IDeleteMediaController } from "./interface-adapters/controllers/delete-media.controller";

packages/media/src/integrations/api/procedures.ts

@@ -0,0 +1,12 @@
+import { t } from "@repo/core-shared/trpc/init";
+import { defineErrorMiddleware } from "@repo/core-shared/trpc/define-error-middleware";
+
+import { MediaNotFoundError } from "../../entities/errors/media";
+import { InputParseError } from "../../entities/errors/common";
+
+export const mediaProcedure = t.procedure.use(
+  defineErrorMiddleware([
+    [InputParseError, "BAD_REQUEST"],
+    [MediaNotFoundError, "NOT_FOUND"],
+  ]),
+);

packages/media/src/integrations/api/router.test.ts

@@ -0,0 +1,138 @@
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { TRPCError } from "@trpc/server";
+import { injectable } from "inversify";
+import { mediaContainer } from "@/di/container";
+import { MediaModule } from "@/di/module";
+import { MEDIA_SYMBOLS } from "@/di/symbols";
+import { getMediaUseCase } from "@/application/use-cases/get-media.use-case";
+import { listMediaUseCase } from "@/application/use-cases/list-media.use-case";
+import { deleteMediaUseCase } from "@/application/use-cases/delete-media.use-case";
+import { getMediaController } from "@/interface-adapters/controllers/get-media.controller";
+import { listMediaController } from "@/interface-adapters/controllers/list-media.controller";
+import { deleteMediaController } from "@/interface-adapters/controllers/delete-media.controller";
+import { mediaRouter } from "@/integrations/api/router";
+
+describe("mediaRouter", () => {
+  beforeEach(() => {
+    mediaContainer.unbindAll();
+    mediaContainer.load(MediaModule);
+  });
+
+  afterEach(() => {
+    mediaContainer.unbindAll();
+  });
+
+  it("exposes getMedia, listMedia, deleteMedia procedures", () => {
+    const names = Object.keys(mediaRouter._def.procedures);
+    expect(names).toContain("getMedia");
+    expect(names).toContain("listMedia");
+    expect(names).toContain("deleteMedia");
+  });
+
+  it("listMedia returns empty array by default", async () => {
+    const caller = mediaRouter.createCaller({});
+    const result = await caller.listMedia({});
+    expect(result).toEqual([]);
+  });
+});
+
+describe("mediaRouter (R26 error mapping)", () => {
+  beforeEach(() => {
+    mediaContainer.unbindAll();
+    mediaContainer.load(MediaModule);
+  });
+
+  afterEach(() => {
+    mediaContainer.unbindAll();
+  });
+
+  it("translates MediaNotFoundError → NOT_FOUND when id is missing", async () => {
+    const caller = mediaRouter.createCaller({});
+    try {
+      await caller.getMedia({ id: "nonexistent-id" });
+      throw new Error("expected throw");
+    } catch (e) {
+      expect(e).toBeInstanceOf(TRPCError);
+      expect((e as TRPCError).code).toBe("NOT_FOUND");
+    }
+  });
+
+  it("translates zod parse failure → BAD_REQUEST on getMedia with empty id", async () => {
+    const caller = mediaRouter.createCaller({});
+    try {
+      await caller.getMedia({} as unknown as { id: string });
+      throw new Error("expected throw");
+    } catch (e) {
+      expect(e).toBeInstanceOf(TRPCError);
+      expect((e as TRPCError).code).toBe("BAD_REQUEST");
+    }
+  });
+
+  it("translates MediaNotFoundError → NOT_FOUND on deleteMedia with missing id", async () => {
+    const caller = mediaRouter.createCaller({});
+    try {
+      await caller.deleteMedia({ id: "nonexistent-id" });
+      throw new Error("expected throw");
+    } catch (e) {
+      expect(e).toBeInstanceOf(TRPCError);
+      expect((e as TRPCError).code).toBe("NOT_FOUND");
+    }
+  });
+
+  it("translates MediaNotFoundError → NOT_FOUND via NullMediaRepository", async () => {
+    @injectable()
+    class NullMediaRepository {
+      async getMedia() {
+        return undefined as never;
+      }
+      async listMedia() {
+        return [] as never;
+      }
+      async deleteMedia() {
+        return;
+      }
+    }
+
+    mediaContainer.unbindAll();
+    mediaContainer.bind(MEDIA_SYMBOLS.IMediaRepository).to(NullMediaRepository);
+    mediaContainer
+      .bind(MEDIA_SYMBOLS.IGetMediaUseCase)
+      .toDynamicValue((ctx) =>
+        getMediaUseCase(ctx.container.get(MEDIA_SYMBOLS.IMediaRepository)),
+      );
+    mediaContainer
+      .bind(MEDIA_SYMBOLS.IListMediaUseCase)
+      .toDynamicValue((ctx) =>
+        listMediaUseCase(ctx.container.get(MEDIA_SYMBOLS.IMediaRepository)),
+      );
+    mediaContainer
+      .bind(MEDIA_SYMBOLS.IDeleteMediaUseCase)
+      .toDynamicValue((ctx) =>
+        deleteMediaUseCase(ctx.container.get(MEDIA_SYMBOLS.IMediaRepository)),
+      );
+    mediaContainer
+      .bind(MEDIA_SYMBOLS.IGetMediaController)
+      .toDynamicValue((ctx) =>
+        getMediaController(ctx.container.get(MEDIA_SYMBOLS.IGetMediaUseCase)),
+      );
+    mediaContainer
+      .bind(MEDIA_SYMBOLS.IListMediaController)
+      .toDynamicValue((ctx) =>
+        listMediaController(ctx.container.get(MEDIA_SYMBOLS.IListMediaUseCase)),
+      );
+    mediaContainer
+      .bind(MEDIA_SYMBOLS.IDeleteMediaController)
+      .toDynamicValue((ctx) =>
+        deleteMediaController(ctx.container.get(MEDIA_SYMBOLS.IDeleteMediaUseCase)),
+      );
+
+    const caller = mediaRouter.createCaller({});
+    try {
+      await caller.getMedia({ id: "any-id" });
+      throw new Error("expected throw");
+    } catch (e) {
+      expect(e).toBeInstanceOf(TRPCError);
+      expect((e as TRPCError).code).toBe("NOT_FOUND");
+    }
+  });
+});

packages/media/src/integrations/api/router.ts

@@ -1,45 +1,31 @@
-import { z } from "zod";
-import { router, publicProcedure } from "@repo/core-shared/trpc/init";
+import { router } from "@repo/core-shared/trpc/init";
+
 import { mediaContainer } from "../../di/container";
 import { MEDIA_SYMBOLS } from "../../di/symbols";
+
+import { getMediaInputSchema } from "../../application/use-cases/get-media.use-case";
+import { listMediaInputSchema } from "../../application/use-cases/list-media.use-case";
+import { deleteMediaInputSchema } from "../../application/use-cases/delete-media.use-case";
+
 import type { IGetMediaController } from "../../interface-adapters/controllers/get-media.controller";
 import type { IListMediaController } from "../../interface-adapters/controllers/list-media.controller";
 import type { IDeleteMediaController } from "../../interface-adapters/controllers/delete-media.controller";
 
+import { mediaProcedure } from "./procedures";
+
 export const mediaRouter = router({
-  getMedia: publicProcedure
-    .input(z.object({ id: z.string().min(1) }))
-    .query(({ input }) => {
-      const ctrl = mediaContainer.get<IGetMediaController>(
-        MEDIA_SYMBOLS.IGetMediaController,
-      );
-      return ctrl(input);
-    }),
-
-  listMedia: publicProcedure
-    .input(
-      z
-        .object({
-          limit: z.number().optional(),
-          offset: z.number().optional(),
-        })
-        .optional(),
-    )
-    .query(({ input }) => {
-      const ctrl = mediaContainer.get<IListMediaController>(
-        MEDIA_SYMBOLS.IListMediaController,
-      );
-      return ctrl(input ?? {});
-    }),
-
-  deleteMedia: publicProcedure
-    .input(z.object({ id: z.string().min(1) }))
-    .mutation(({ input }) => {
-      const ctrl = mediaContainer.get<IDeleteMediaController>(
-        MEDIA_SYMBOLS.IDeleteMediaController,
-      );
-      return ctrl(input);
-    }),
+  getMedia: mediaProcedure.input(getMediaInputSchema).query(({ input }) => {
+    const ctrl = mediaContainer.get<IGetMediaController>(MEDIA_SYMBOLS.IGetMediaController);
+    return ctrl(input);
+  }),
+  listMedia: mediaProcedure.input(listMediaInputSchema).query(({ input }) => {
+    const ctrl = mediaContainer.get<IListMediaController>(MEDIA_SYMBOLS.IListMediaController);
+    return ctrl(input);
+  }),
+  deleteMedia: mediaProcedure.input(deleteMediaInputSchema).mutation(({ input }) => {
+    const ctrl = mediaContainer.get<IDeleteMediaController>(MEDIA_SYMBOLS.IDeleteMediaController);
+    return ctrl(input);
+  }),
 });
 
 export type MediaRouter = typeof mediaRouter;

packages/media/src/interface-adapters/controllers/delete-media.controller.ts

@@ -1,19 +1,17 @@
-import { z } from "zod";
 import { InputParseError } from "../../entities/errors/common";
-import type { IDeleteMediaUseCase } from "../../application/use-cases/delete-media.use-case";
-
-const inputSchema = z.object({
-  id: z.string().min(1),
-});
+import {
+  deleteMediaInputSchema,
+  type IDeleteMediaUseCase,
+} from "../../application/use-cases/delete-media.use-case";
 
 export type IDeleteMediaController = ReturnType<typeof deleteMediaController>;
 
 export const deleteMediaController =
   (deleteMediaUseCase: IDeleteMediaUseCase) =>
-  async (input: Partial<z.infer<typeof inputSchema>>): Promise<void> => {
-    const parsed = inputSchema.safeParse(input);
+  async (input: unknown): Promise<void> => {
+    const parsed = deleteMediaInputSchema.safeParse(input);
     if (!parsed.success) {
       throw new InputParseError("Invalid delete-media input", { cause: parsed.error });
     }
-    return deleteMediaUseCase(parsed.data);
+    await deleteMediaUseCase(parsed.data);
   };

packages/media/src/interface-adapters/controllers/get-media.controller.ts

@@ -1,20 +1,23 @@
-import { z } from "zod";
 import { InputParseError } from "../../entities/errors/common";
-import type { Media } from "../../entities/models/media";
-import type { IGetMediaUseCase } from "../../application/use-cases/get-media.use-case";
+import {
+  getMediaInputSchema,
+  type GetMediaOutput,
+  type IGetMediaUseCase,
+} from "../../application/use-cases/get-media.use-case";
 
-const inputSchema = z.object({
-  id: z.string().min(1),
-});
+function presenter(value: GetMediaOutput) {
+  return value;
+}
 
 export type IGetMediaController = ReturnType<typeof getMediaController>;
 
 export const getMediaController =
   (getMediaUseCase: IGetMediaUseCase) =>
-  async (input: Partial<z.infer<typeof inputSchema>>): Promise<Media> => {
-    const parsed = inputSchema.safeParse(input);
+  async (input: unknown): Promise<ReturnType<typeof presenter>> => {
+    const parsed = getMediaInputSchema.safeParse(input);
     if (!parsed.success) {
       throw new InputParseError("Invalid get-media input", { cause: parsed.error });
     }
-    return getMediaUseCase(parsed.data);
+    const result = await getMediaUseCase(parsed.data);
+    return presenter(result);
   };

packages/media/src/interface-adapters/controllers/list-media.controller.ts

@@ -1,21 +1,23 @@
-import { z } from "zod";
 import { InputParseError } from "../../entities/errors/common";
-import type { Media } from "../../entities/models/media";
-import type { IListMediaUseCase } from "../../application/use-cases/list-media.use-case";
+import {
+  listMediaInputSchema,
+  type ListMediaOutput,
+  type IListMediaUseCase,
+} from "../../application/use-cases/list-media.use-case";
 
-const inputSchema = z.object({
-  limit: z.number().optional(),
-  offset: z.number().optional(),
-});
+function presenter(value: ListMediaOutput) {
+  return value;
+}
 
 export type IListMediaController = ReturnType<typeof listMediaController>;
 
 export const listMediaController =
   (listMediaUseCase: IListMediaUseCase) =>
-  async (input: Partial<z.infer<typeof inputSchema>>): Promise<Media[]> => {
-    const parsed = inputSchema.safeParse(input);
+  async (input: unknown): Promise<ReturnType<typeof presenter>> => {
+    const parsed = listMediaInputSchema.safeParse(input);
     if (!parsed.success) {
       throw new InputParseError("Invalid list-media input", { cause: parsed.error });
     }
-    return listMediaUseCase(parsed.data);
+    const result = await listMediaUseCase(parsed.data);
+    return presenter(result);
   };

packages/media/src/ui/index.ts

@@ -0,0 +1,4 @@
+// Media has no React Query option builders today. This file is the
+// public UI surface for future components and queries — extend rather
+// than re-add to root index.ts.
+export {};