refactor(marketing-pages): unify use-case I/O schemas + presenter + feature error map
Per Plan 9 (spec R1-R28):
- Use cases: input + output schemas (getPageBySlug, getSiteSettings).
Site-settings input is z.object({}).strict() per R5 (uniform input).
- Controllers: unknown input + identity presenter; void output not
applicable (both use cases return data).
- New integrations/api/procedures.ts with marketingPagesProcedure
([InputParseError → BAD_REQUEST], [PageNotFoundError → NOT_FOUND]).
- Router uses marketingPagesProcedure + .input(xInputSchema).
- src/index.ts: remove pageBySlugQuery/siteSettingsQuery; export
schemas + types + IUseCase/IController aliases.
- src/ui/index.ts (NEW); package.json adds ./ui subpath.
- R25 output-validation tests + R26 router error-mapping test.
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
This commit is contained in:
12
packages/marketing-pages/src/integrations/api/procedures.ts
Normal file
12
packages/marketing-pages/src/integrations/api/procedures.ts
Normal file
@@ -0,0 +1,12 @@
|
||||
import { t } from "@repo/core-shared/trpc/init";
|
||||
import { defineErrorMiddleware } from "@repo/core-shared/trpc/define-error-middleware";
|
||||
|
||||
import { PageNotFoundError } from "../../entities/errors/page";
|
||||
import { InputParseError } from "../../entities/errors/common";
|
||||
|
||||
export const marketingPagesProcedure = t.procedure.use(
|
||||
defineErrorMiddleware([
|
||||
[InputParseError, "BAD_REQUEST"],
|
||||
[PageNotFoundError, "NOT_FOUND"],
|
||||
]),
|
||||
);
|
||||
@@ -1,7 +1,19 @@
|
||||
import { describe, it, expect } from "vitest";
|
||||
import { marketingPagesRouter } from "./router";
|
||||
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
||||
import { TRPCError } from "@trpc/server";
|
||||
import { marketingPagesContainer } from "@/di/container";
|
||||
import { MarketingPagesModule } from "@/di/module";
|
||||
import { marketingPagesRouter } from "@/integrations/api/router";
|
||||
|
||||
describe("marketingPagesRouter", () => {
|
||||
beforeEach(() => {
|
||||
marketingPagesContainer.unbindAll();
|
||||
marketingPagesContainer.load(MarketingPagesModule);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
marketingPagesContainer.unbindAll();
|
||||
});
|
||||
|
||||
it("exposes pageBySlug + siteSettings procedures", () => {
|
||||
const names = Object.keys(marketingPagesRouter._def.procedures);
|
||||
expect(names).toContain("pageBySlug");
|
||||
@@ -16,7 +28,35 @@ describe("marketingPagesRouter", () => {
|
||||
|
||||
it("siteSettings returns site name", async () => {
|
||||
const caller = marketingPagesRouter.createCaller({});
|
||||
const result = await caller.siteSettings();
|
||||
const result = await caller.siteSettings({});
|
||||
expect(result.siteName).toBe("My App");
|
||||
});
|
||||
});
|
||||
|
||||
describe("marketingPagesRouter (R26 error mapping)", () => {
|
||||
beforeEach(() => {
|
||||
marketingPagesContainer.unbindAll();
|
||||
marketingPagesContainer.load(MarketingPagesModule);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
marketingPagesContainer.unbindAll();
|
||||
});
|
||||
|
||||
it("translates zod parse failure → BAD_REQUEST on pageBySlug", async () => {
|
||||
const caller = marketingPagesRouter.createCaller({});
|
||||
try {
|
||||
await caller.pageBySlug({} as unknown as { slug: string });
|
||||
throw new Error("expected throw");
|
||||
} catch (e) {
|
||||
expect(e).toBeInstanceOf(TRPCError);
|
||||
expect((e as TRPCError).code).toBe("BAD_REQUEST");
|
||||
}
|
||||
});
|
||||
|
||||
it("returns undefined (not NOT_FOUND) for missing slug since use case returns undefined", async () => {
|
||||
const caller = marketingPagesRouter.createCaller({});
|
||||
const result = await caller.pageBySlug({ slug: "does-not-exist" });
|
||||
expect(result).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,13 +1,19 @@
|
||||
import { z } from "zod";
|
||||
import { router, publicProcedure } from "@repo/core-shared/trpc/init";
|
||||
import { router } from "@repo/core-shared/trpc/init";
|
||||
|
||||
import { marketingPagesContainer } from "../../di/container";
|
||||
import { MARKETING_PAGES_SYMBOLS } from "../../di/symbols";
|
||||
|
||||
import { getPageBySlugInputSchema } from "../../application/use-cases/get-page-by-slug.use-case";
|
||||
import { getSiteSettingsInputSchema } from "../../application/use-cases/get-site-settings.use-case";
|
||||
|
||||
import type { IGetPageBySlugController } from "../../interface-adapters/controllers/get-page-by-slug.controller";
|
||||
import type { IGetSiteSettingsController } from "../../interface-adapters/controllers/get-site-settings.controller";
|
||||
|
||||
import { marketingPagesProcedure } from "./procedures";
|
||||
|
||||
export const marketingPagesRouter = router({
|
||||
pageBySlug: publicProcedure
|
||||
.input(z.object({ slug: z.string().min(1) }))
|
||||
pageBySlug: marketingPagesProcedure
|
||||
.input(getPageBySlugInputSchema)
|
||||
.query(({ input }) => {
|
||||
const ctrl = marketingPagesContainer.get<IGetPageBySlugController>(
|
||||
MARKETING_PAGES_SYMBOLS.IGetPageBySlugController,
|
||||
@@ -15,12 +21,14 @@ export const marketingPagesRouter = router({
|
||||
return ctrl(input);
|
||||
}),
|
||||
|
||||
siteSettings: publicProcedure.query(() => {
|
||||
const ctrl = marketingPagesContainer.get<IGetSiteSettingsController>(
|
||||
MARKETING_PAGES_SYMBOLS.IGetSiteSettingsController,
|
||||
);
|
||||
return ctrl();
|
||||
}),
|
||||
siteSettings: marketingPagesProcedure
|
||||
.input(getSiteSettingsInputSchema)
|
||||
.query(({ input }) => {
|
||||
const ctrl = marketingPagesContainer.get<IGetSiteSettingsController>(
|
||||
MARKETING_PAGES_SYMBOLS.IGetSiteSettingsController,
|
||||
);
|
||||
return ctrl(input);
|
||||
}),
|
||||
});
|
||||
|
||||
export type MarketingPagesRouter = typeof marketingPagesRouter;
|
||||
|
||||
Reference in New Issue
Block a user