diff --git a/httpd-client/lib/project/commit.ts b/httpd-client/lib/project/commit.ts index ee642f542..e0dbcc132 100644 --- a/httpd-client/lib/project/commit.ts +++ b/httpd-client/lib/project/commit.ts @@ -1,23 +1,9 @@ import type { z } from "zod"; +export type { Commits, HunkLine, Commit, Diff, CommitHeader, DiffContent }; + import { array, literal, number, object, optional, string, union } from "zod"; - export { commitHeaderSchema, diffSchema, commitSchema, commitsSchema }; -export type { - Commits, - HunkLine, - Commit, - DiffFile, - Diff, - DiffCopiedChangeset, - DiffMovedChangeset, - CommitHeader, - DiffAddedChangeset, - DiffDeletedChangeset, - DiffModifiedChangeset, - DiffContent, -}; - const gitPersonSchema = object({ name: string(), email: string(), @@ -50,8 +36,6 @@ const deletionHunkLineSchema = object({ type: literal("deletion"), }); -type DiffFile = z.infer; - const diffFileSchema = object({ oid: string(), mode: union([ @@ -103,33 +87,23 @@ const diffChangesetSchema = object({ diff: diffContentSchema, }); -type DiffAddedChangeset = z.infer; - const diffAddedChangesetSchema = diffChangesetSchema.merge( object({ new: diffFileSchema }), ); -type DiffDeletedChangeset = z.infer; - const diffDeletedChangesetSchema = diffChangesetSchema.merge( object({ old: diffFileSchema }), ); -type DiffModifiedChangeset = z.infer; - const diffModifiedChangesetSchema = diffChangesetSchema.merge( object({ new: diffFileSchema, old: diffFileSchema }), ); -type DiffCopiedChangeset = z.infer; - const diffCopiedChangesetSchema = object({ newPath: string(), oldPath: string(), }); -type DiffMovedChangeset = z.infer; - const diffMovedChangesetSchema = diffCopiedChangesetSchema.merge( object({ old: optional(diffFileSchema),