Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ on:
jobs:
check:
runs-on: ubuntu-latest
# a real Postgres for the library server's highlights tests (the production driver, postgres.js, passes parameters differently from PGlite)
services:
postgres:
image: postgres:16
env:
POSTGRES_PASSWORD: postgres
POSTGRES_DB: hltest
ports: ['5432:5432']
options: --health-cmd pg_isready --health-interval 5s --health-timeout 5s --health-retries 10
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
Expand All @@ -18,6 +27,10 @@ jobs:
- run: pnpm lint
- run: pnpm typecheck
- run: pnpm test
- name: The library server's highlights on a real Postgres
run: pnpm --filter @chalk-format/library-server exec vitest run src/highlights.test.ts
env:
TEST_POSTGRES_URL: postgres://postgres:postgres@127.0.0.1:5432/hltest
- name: JSON Schema is up to date with the model
run: pnpm gen:schema && git diff --exit-code schema/
- name: Shared lab library builds reproduce their keys (libraries/catalog.json)
Expand Down
4 changes: 3 additions & 1 deletion packages/library-server/src/highlights.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ describe('book highlights (registry-api §11)', () => {
const b = (p: string) => `/v1/books/${BOOK}${p}`;
const ids = async () => Object.fromEntries(((await call('GET', b('/lines/all?retired=1'))).body.items as { id: string; key: string }[]).map((l) => [l.key, l.id]));

beforeAll(async () => { db = await openDb('pglite:'); }, 60_000);
// PGlite by default; TEST_POSTGRES_URL runs the same tests on a real Postgres through postgres.js (the production driver: it passes
// parameters differently, which PGlite alone did not show)
beforeAll(async () => { db = await openDb(process.env.TEST_POSTGRES_URL ?? 'pglite:'); }, 60_000);
afterAll(async () => { await db.close(); });
beforeEach(async () => {
await db.query('DELETE FROM book_links'); await db.query('DELETE FROM book_lines');
Expand Down
8 changes: 4 additions & 4 deletions packages/library-server/src/highlights.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export function registerHighlights(app: Hono<{ Variables: AuthVariables }>, o: {
for (const part of chunks(plan.write)) {
await q(`INSERT INTO book_lines (book, key, page_id, page_no, idx, block, kind, text, text_hash, chapter_no, chapter_title, section, rects)
SELECT $1, x.key, x."pageId", x."pageNo", x.idx, x.block, x.kind, x.text, x."textHash", x."chapterNo", x."chapterTitle", x.section, coalesce(x.rects, '[]')
FROM jsonb_to_recordset($2::jsonb) AS ${LINE_RECORDSET}
FROM jsonb_to_recordset($2::text::jsonb) AS ${LINE_RECORDSET}
ON CONFLICT (book, key) DO UPDATE SET page_id = EXCLUDED.page_id, page_no = EXCLUDED.page_no, idx = EXCLUDED.idx, block = EXCLUDED.block, kind = EXCLUDED.kind,
text = EXCLUDED.text, text_hash = EXCLUDED.text_hash, chapter_no = EXCLUDED.chapter_no, chapter_title = EXCLUDED.chapter_title, section = EXCLUDED.section, rects = EXCLUDED.rects, retired_at = NULL, updated_at = now()`,
[book, JSON.stringify(part)]);
Expand Down Expand Up @@ -478,19 +478,19 @@ export function registerHighlights(app: Hono<{ Variables: AuthVariables }>, o: {
for (const part of chunks(b.lines)) {
await q(`INSERT INTO book_lines (id, book, key, page_id, page_no, idx, block, kind, text, text_hash, chapter_no, chapter_title, section, rects, retired_at)
SELECT x.id, $1, x.key, x."pageId", x."pageNo", x.idx, x.block, x.kind, x.text, x."textHash", x."chapterNo", x."chapterTitle", x.section, coalesce(x.rects, '[]'), x."retiredAt"
FROM jsonb_to_recordset($2::jsonb) AS ${LINE_RECORDSET}
FROM jsonb_to_recordset($2::text::jsonb) AS ${LINE_RECORDSET}
ON CONFLICT (id) DO UPDATE SET key = EXCLUDED.key, page_id = EXCLUDED.page_id, page_no = EXCLUDED.page_no, idx = EXCLUDED.idx, block = EXCLUDED.block, kind = EXCLUDED.kind,
text = EXCLUDED.text, text_hash = EXCLUDED.text_hash, chapter_no = EXCLUDED.chapter_no, chapter_title = EXCLUDED.chapter_title, section = EXCLUDED.section,
rects = EXCLUDED.rects, retired_at = EXCLUDED.retired_at, updated_at = now()
WHERE book_lines.book = $1`, [book, JSON.stringify(part)]);
}
for (const part of chunks(b.links)) {
const bad = await q<{ id: string }>(`SELECT x."lineId" AS id FROM jsonb_to_recordset($2::jsonb) AS x("lineId" uuid)
const bad = await q<{ id: string }>(`SELECT x."lineId" AS id FROM jsonb_to_recordset($2::text::jsonb) AS x("lineId" uuid)
WHERE NOT EXISTS (SELECT 1 FROM book_lines l WHERE l.id = x."lineId" AND l.book = $1) LIMIT 1`, [book, JSON.stringify(part)]);
if (bad.length) throw notFound(`line ${bad[0]!.id} is not in this book`);
await q(`INSERT INTO book_links (id, book, question_id, line_id, role, scope, method, status, score, rationale, question_type, reviewed_by, reviewed_at, created_at)
SELECT x.id, $1, x."questionId", x."lineId", x.role, x.scope, x.method, x.status, x.score, x.rationale, x."questionType", x."reviewedBy", x."reviewedAt", coalesce(x."createdAt", now())
FROM jsonb_to_recordset($2::jsonb) AS x(id uuid, "questionId" uuid, "lineId" uuid, role text, scope text, method text, status text, score real, rationale text,
FROM jsonb_to_recordset($2::text::jsonb) AS x(id uuid, "questionId" uuid, "lineId" uuid, role text, scope text, method text, status text, score real, rationale text,
"questionType" text, "reviewedBy" text, "reviewedAt" timestamptz, "createdAt" timestamptz)
ON CONFLICT (id) DO UPDATE SET question_id = EXCLUDED.question_id, line_id = EXCLUDED.line_id, role = EXCLUDED.role, scope = EXCLUDED.scope, method = EXCLUDED.method,
status = EXCLUDED.status, score = EXCLUDED.score, rationale = EXCLUDED.rationale, question_type = EXCLUDED.question_type, reviewed_by = EXCLUDED.reviewed_by,
Expand Down
Loading