原来只有 `apps/web` 在 Prettier 下(配置在 `apps/web/.prettierrc.toml`、脚本在 web 的 package.json),后端和契约从来没格式化过 —— 手写在 100 列上下,`db/schema.ts` 还是 drizzle-kit pull 留下的 tab 缩进。两套口径分叉久了,跨端改一处就得记着「这边 什么风格」。 - 配置搬到根目录 `.prettierrc.toml`,内容不变(`semi=false`,其余全默认, printWidth 80 —— 和前端已有的格式一致,不另立一套宽度); - 脚本统一成根目录 `bun run fmt`,覆盖 `apps/*/src`、`apps/web/tests` 和两个构建 配置;web 自己那份 `fmt` 和重复的 prettier 依赖删掉; - `.prettierignore` 挡掉两类不该碰的:drizzle-kit 生成的 `src/db/meta/` 结构快照 (它是 db:generate 的比对输入,只该由 drizzle-kit 写)、unplugin 每次 dev 都会 重写的 `auto-imports.d.ts` / `components.d.ts`; - 全量跑了一遍。纯格式,无行为改动:api typecheck / check:routes / check:ast、 前端 type-check 全过,起 api 打了接口确认正常。前端这 39 个文件的小改动是 prettier 版本漂移(类型断言的换行口径变了),不是新配置带来的。 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e600fd24cf
commit
ed56a209ea
122 files changed
+10557
-4843
No files matched your search
@@ -34,7 +34,11 @@ function serialize(row: {
|
||||
|
||||
function selectOne(id: number) {
|
||||
return db
|
||||
.select({ announcement: schema.announcement, user: schema.user, realName: schema.userProfile.realName })
|
||||
.select({
|
||||
announcement: schema.announcement,
|
||||
user: schema.user,
|
||||
realName: schema.userProfile.realName,
|
||||
})
|
||||
.from(schema.announcement)
|
||||
.innerJoin(schema.user, eq(schema.announcement.createdById, schema.user.id))
|
||||
.leftJoin(schema.userProfile, eq(schema.userProfile.userId, schema.user.id))
|
||||
@@ -47,10 +51,21 @@ adminAnnouncementRoutes.get("/announcements", requireSuperAdmin, async (c) => {
|
||||
const offset = queryInteger(c.req.query("offset"), 0, { min: 0 })
|
||||
const [totalRows, rows] = await Promise.all([
|
||||
db.select({ value: count() }).from(schema.announcement),
|
||||
db.select({ announcement: schema.announcement, user: schema.user, realName: schema.userProfile.realName })
|
||||
db
|
||||
.select({
|
||||
announcement: schema.announcement,
|
||||
user: schema.user,
|
||||
realName: schema.userProfile.realName,
|
||||
})
|
||||
.from(schema.announcement)
|
||||
.innerJoin(schema.user, eq(schema.announcement.createdById, schema.user.id))
|
||||
.leftJoin(schema.userProfile, eq(schema.userProfile.userId, schema.user.id))
|
||||
.innerJoin(
|
||||
schema.user,
|
||||
eq(schema.announcement.createdById, schema.user.id),
|
||||
)
|
||||
.leftJoin(
|
||||
schema.userProfile,
|
||||
eq(schema.userProfile.userId, schema.user.id),
|
||||
)
|
||||
.orderBy(desc(schema.announcement.createTime))
|
||||
.limit(limit)
|
||||
.offset(offset),
|
||||
@@ -63,52 +78,106 @@ adminAnnouncementRoutes.get("/announcements", requireSuperAdmin, async (c) => {
|
||||
})
|
||||
|
||||
adminAnnouncementRoutes.post("/announcements", requireSuperAdmin, async (c) => {
|
||||
const parsed = createAnnouncementRequestSchema.safeParse(await c.req.json().catch(() => null))
|
||||
const parsed = createAnnouncementRequestSchema.safeParse(
|
||||
await c.req.json().catch(() => null),
|
||||
)
|
||||
if (!parsed.success) {
|
||||
return failure(c, 400, "invalid-request", parsed.error.issues[0]?.message ?? "Invalid payload")
|
||||
return failure(
|
||||
c,
|
||||
400,
|
||||
"invalid-request",
|
||||
parsed.error.issues[0]?.message ?? "Invalid payload",
|
||||
)
|
||||
}
|
||||
const now = new Date().toISOString()
|
||||
const [created] = await db.insert(schema.announcement).values({
|
||||
...parsed.data,
|
||||
createTime: now,
|
||||
lastUpdateTime: now,
|
||||
createdById: c.get("user")!.id,
|
||||
}).returning({ id: schema.announcement.id })
|
||||
const [created] = await db
|
||||
.insert(schema.announcement)
|
||||
.values({
|
||||
...parsed.data,
|
||||
createTime: now,
|
||||
lastUpdateTime: now,
|
||||
createdById: c.get("user")!.id,
|
||||
})
|
||||
.returning({ id: schema.announcement.id })
|
||||
const [row] = await selectOne(created!.id)
|
||||
return success(c, serialize(row!), 201)
|
||||
})
|
||||
|
||||
adminAnnouncementRoutes.get("/announcements/:id", requireSuperAdmin, async (c) => {
|
||||
const [row] = await selectOne(queryInteger(c.req.param("id"), 0, { min: 1 }))
|
||||
if (!row) return failure(c, 404, "announcement-not-found", "Announcement does not exist")
|
||||
return success(c, serialize(row))
|
||||
})
|
||||
adminAnnouncementRoutes.get(
|
||||
"/announcements/:id",
|
||||
requireSuperAdmin,
|
||||
async (c) => {
|
||||
const [row] = await selectOne(
|
||||
queryInteger(c.req.param("id"), 0, { min: 1 }),
|
||||
)
|
||||
if (!row)
|
||||
return failure(
|
||||
c,
|
||||
404,
|
||||
"announcement-not-found",
|
||||
"Announcement does not exist",
|
||||
)
|
||||
return success(c, serialize(row))
|
||||
},
|
||||
)
|
||||
|
||||
adminAnnouncementRoutes.put("/announcements/:id", requireSuperAdmin, async (c) => {
|
||||
const id = queryInteger(c.req.param("id"), 0, { min: 1 })
|
||||
const parsed = updateAnnouncementRequestSchema.safeParse(await c.req.json().catch(() => null))
|
||||
if (!parsed.success) {
|
||||
return failure(c, 400, "invalid-request", parsed.error.issues[0]?.message ?? "Invalid payload")
|
||||
}
|
||||
const updated = await db.update(schema.announcement)
|
||||
.set({ ...parsed.data, lastUpdateTime: new Date().toISOString() })
|
||||
.where(eq(schema.announcement.id, id))
|
||||
.returning({ id: schema.announcement.id })
|
||||
if (updated.length === 0) {
|
||||
return failure(c, 404, "announcement-not-found", "Announcement does not exist")
|
||||
}
|
||||
const [row] = await selectOne(id)
|
||||
return success(c, serialize(row!))
|
||||
})
|
||||
adminAnnouncementRoutes.put(
|
||||
"/announcements/:id",
|
||||
requireSuperAdmin,
|
||||
async (c) => {
|
||||
const id = queryInteger(c.req.param("id"), 0, { min: 1 })
|
||||
const parsed = updateAnnouncementRequestSchema.safeParse(
|
||||
await c.req.json().catch(() => null),
|
||||
)
|
||||
if (!parsed.success) {
|
||||
return failure(
|
||||
c,
|
||||
400,
|
||||
"invalid-request",
|
||||
parsed.error.issues[0]?.message ?? "Invalid payload",
|
||||
)
|
||||
}
|
||||
const updated = await db
|
||||
.update(schema.announcement)
|
||||
.set({ ...parsed.data, lastUpdateTime: new Date().toISOString() })
|
||||
.where(eq(schema.announcement.id, id))
|
||||
.returning({ id: schema.announcement.id })
|
||||
if (updated.length === 0) {
|
||||
return failure(
|
||||
c,
|
||||
404,
|
||||
"announcement-not-found",
|
||||
"Announcement does not exist",
|
||||
)
|
||||
}
|
||||
const [row] = await selectOne(id)
|
||||
return success(c, serialize(row!))
|
||||
},
|
||||
)
|
||||
|
||||
adminAnnouncementRoutes.delete("/announcements/:id", requireSuperAdmin, async (c) => {
|
||||
// 旧后端删不存在的公告也返回成功(filter().delete() 不报错)。这里改成 404:
|
||||
// 后台是人手点删除,静默成功会让人以为删掉了,刷新后它还在。
|
||||
const deleted = await db.delete(schema.announcement)
|
||||
.where(eq(schema.announcement.id, queryInteger(c.req.param("id"), 0, { min: 1 })))
|
||||
.returning({ id: schema.announcement.id })
|
||||
if (deleted.length === 0) {
|
||||
return failure(c, 404, "announcement-not-found", "Announcement does not exist")
|
||||
}
|
||||
return success(c, null)
|
||||
})
|
||||
adminAnnouncementRoutes.delete(
|
||||
"/announcements/:id",
|
||||
requireSuperAdmin,
|
||||
async (c) => {
|
||||
// 旧后端删不存在的公告也返回成功(filter().delete() 不报错)。这里改成 404:
|
||||
// 后台是人手点删除,静默成功会让人以为删掉了,刷新后它还在。
|
||||
const deleted = await db
|
||||
.delete(schema.announcement)
|
||||
.where(
|
||||
eq(
|
||||
schema.announcement.id,
|
||||
queryInteger(c.req.param("id"), 0, { min: 1 }),
|
||||
),
|
||||
)
|
||||
.returning({ id: schema.announcement.id })
|
||||
if (deleted.length === 0) {
|
||||
return failure(
|
||||
c,
|
||||
404,
|
||||
"announcement-not-found",
|
||||
"Announcement does not exist",
|
||||
)
|
||||
}
|
||||
return success(c, null)
|
||||
},
|
||||
)
|
||||
Reference in new issue
Block a user