diff --git a/.env.example b/.env.example index eba6428..0c7804a 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,4 @@ DATABASE_URL=postgres://postgres:mypassword@db-host:5432/databasename -DATABASE_URL_LOCAL=postgres://postgres:mypassword@localhost:5432/databasename POSTGRES_USER=postgres POSTGRES_PASSWORD=postgres @@ -11,11 +10,3 @@ GOOGLE_CLIENT_ID= GOOGLE_CLIENT_SECRET= GITHUB_CLIENT_ID= GITHUB_CLIENT_SECRET= - -VITE_WS_URL= - -UID=1000 -GID=1000 - -RESEND_API_KEY= -EMAIL_FROM=mail@example.com diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index dc34ae3..a48cee1 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -5,31 +5,8 @@ on: branches: [main] jobs: - quality: - runs-on: docker - steps: - - name: Install tools - run: apt-get update && apt-get install -y nodejs - - name: Checkout code - uses: https://data.forgejo.org/actions/checkout@v4 - - name: Install pnpm - run: npm install -g pnpm - - name: Install dependencies - run: pnpm install - - name: Build shared packages - run: pnpm --filter @lila/shared build && pnpm --filter @lila/db build - - name: Format check - run: pnpm format:check - - name: Lint - run: pnpm lint - - name: Type-check - run: pnpm typecheck - - name: Test - run: pnpm test:run - build-and-deploy: runs-on: docker - needs: quality steps: - name: Install tools run: apt-get update && apt-get install -y docker.io openssh-client diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index cb2c84d..0000000 --- a/.husky/pre-commit +++ /dev/null @@ -1 +0,0 @@ -pnpm lint-staged diff --git a/.husky/pre-push b/.husky/pre-push deleted file mode 100755 index 6c45485..0000000 --- a/.husky/pre-push +++ /dev/null @@ -1 +0,0 @@ -pnpm test:run diff --git a/.prettierignore b/.prettierignore index 773c5d1..9699559 100644 --- a/.prettierignore +++ b/.prettierignore @@ -18,5 +18,3 @@ coverage/ pnpm-lock.yaml routeTree.gen.ts - -.pnpm-store/ diff --git a/Caddyfile b/Caddyfile index 0f95af4..5705a44 100644 --- a/Caddyfile +++ b/Caddyfile @@ -1,11 +1,4 @@ lilastudy.com { - header { - X-Content-Type-Options "nosniff" - X-Frame-Options "DENY" - Referrer-Policy "strict-origin-when-cross-origin" - Strict-Transport-Security "max-age=31536000; includeSubDomains" - Content-Security-Policy "default-src 'self'; connect-src 'self' https://api.lilastudy.com wss://api.lilastudy.com; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self'" - } reverse_proxy web:80 } diff --git a/README.md b/README.md index 66a5195..32af038 100644 --- a/README.md +++ b/README.md @@ -10,27 +10,27 @@ Live at [lilastudy.com](https://lilastudy.com). ## Stack -| Layer | Technology | -| ------------ | ---------------------------------- | -| Monorepo | pnpm workspaces | -| Frontend | React 18, Vite, TypeScript | -| Routing | TanStack Router | -| Server state | TanStack Query | -| Styling | Tailwind CSS | -| Backend | Node.js, Express, TypeScript | -| Database | PostgreSQL + Drizzle ORM | -| Validation | Zod (shared schemas) | -| Auth | Better Auth (Google + GitHub) | -| Realtime | WebSockets (`ws` library) | -| Testing | Vitest, supertest | -| Deployment | Docker Compose, Caddy, Hetzner VPS | -| CI/CD | Forgejo Actions | +| Layer | Technology | +|---|---| +| Monorepo | pnpm workspaces | +| Frontend | React 18, Vite, TypeScript | +| Routing | TanStack Router | +| Server state | TanStack Query | +| Styling | Tailwind CSS | +| Backend | Node.js, Express, TypeScript | +| Database | PostgreSQL + Drizzle ORM | +| Validation | Zod (shared schemas) | +| Auth | Better Auth (Google + GitHub) | +| Realtime | WebSockets (`ws` library) | +| Testing | Vitest, supertest | +| Deployment | Docker Compose, Caddy, Hetzner VPS | +| CI/CD | Forgejo Actions | --- ## Repository Structure -```tree +``` lila/ ├── apps/ │ ├── api/ — Express backend @@ -50,7 +50,7 @@ lila/ Requests flow through a strict layered architecture: -```text +``` HTTP Request → Router → Controller → Service → Model → Database ``` @@ -71,7 +71,7 @@ Vocabulary data is sourced from WordNet and the Open Multilingual Wordnet (OMW). ## API -```text +``` POST /api/v1/game/start — start a quiz session (auth required) POST /api/v1/game/answer — submit an answer (auth required) GET /api/v1/health — health check (public) @@ -90,7 +90,7 @@ Rooms are created via REST, then managed over WebSockets. Messages are typed via ## Infrastructure -```tree +``` Internet → Caddy (HTTPS) ├── lilastudy.com → web (nginx, static files) ├── api.lilastudy.com → api (Express) @@ -156,15 +156,15 @@ pnpm --filter web test ## Roadmap -| Phase | Description | Status | -| ----- | ---------------------------------------------------------------------- | ------ | -| 0 | Foundation — monorepo, tooling, dev environment | ✅ | -| 1 | Vocabulary data pipeline + REST API | ✅ | -| 2 | Singleplayer quiz UI | ✅ | -| 3 | Auth (Google + GitHub) | ✅ | -| 4 | Multiplayer lobby (WebSockets) | ✅ | -| 5 | Multiplayer game (real-time, server timer) | ✅ | -| 6 | Production deployment + CI/CD | ✅ | -| 7 | Hardening (rate limiting, error boundaries, monitoring, accessibility) | 🔄 | +| Phase | Description | Status | +|---|---|---| +| 0 | Foundation — monorepo, tooling, dev environment | ✅ | +| 1 | Vocabulary data pipeline + REST API | ✅ | +| 2 | Singleplayer quiz UI | ✅ | +| 3 | Auth (Google + GitHub) | ✅ | +| 4 | Multiplayer lobby (WebSockets) | ✅ | +| 5 | Multiplayer game (real-time, server timer) | ✅ | +| 6 | Production deployment + CI/CD | ✅ | +| 7 | Hardening (rate limiting, error boundaries, monitoring, accessibility) | 🔄 | See `documentation/roadmap.md` for task-level detail. diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile index 9026478..fa4b48c 100644 --- a/apps/api/Dockerfile +++ b/apps/api/Dockerfile @@ -22,12 +22,9 @@ CMD ["pnpm", "--filter", "api", "dev"] # 4. build FROM base AS builder WORKDIR /app -COPY pnpm-lock.yaml pnpm-workspace.yaml package.json ./ -COPY apps/api/package.json ./apps/api/ -COPY packages/shared/package.json ./packages/shared/ -COPY packages/db/package.json ./packages/db/ -RUN pnpm install --frozen-lockfile +COPY --from=deps /app/node_modules ./node_modules COPY . . +RUN pnpm install RUN pnpm --filter shared build RUN pnpm --filter db build RUN pnpm --filter api build @@ -42,7 +39,6 @@ COPY packages/db/package.json ./packages/db/ COPY --from=builder /app/apps/api/dist ./apps/api/dist COPY --from=builder /app/packages/shared/dist ./packages/shared/dist COPY --from=builder /app/packages/db/dist ./packages/db/dist -COPY --from=builder /app/packages/db/drizzle ./packages/db/drizzle RUN pnpm install --frozen-lockfile --prod EXPOSE 3000 -CMD ["sh", "-c", "node packages/db/dist/src/migrate.js && node apps/api/dist/src/server.js"] +CMD ["node", "apps/api/dist/src/server.js"] diff --git a/apps/api/package.json b/apps/api/package.json index 1a7cdc3..bfd2878 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -7,8 +7,7 @@ "dev": "pnpm --filter shared build && pnpm --filter db build && tsx watch src/server.ts", "build": "tsc", "start": "node dist/src/server.js", - "test": "vitest", - "typecheck": "tsc --noEmit" + "test": "vitest" }, "dependencies": { "@lila/db": "workspace:*", @@ -16,9 +15,6 @@ "better-auth": "^1.6.2", "cors": "^2.8.6", "express": "^5.2.1", - "express-rate-limit": "^8.4.0", - "helmet": "^8.1.0", - "resend": "^6.12.2", "ws": "^8.20.0" }, "devDependencies": { diff --git a/apps/api/src/app.test.ts b/apps/api/src/app.test.ts deleted file mode 100644 index f41d3f0..0000000 --- a/apps/api/src/app.test.ts +++ /dev/null @@ -1,39 +0,0 @@ -import request from "supertest"; -import { describe, it, expect } from "vitest"; -import { createApp } from "./app.js"; - -const app = createApp(); - -describe("security headers (helmet)", () => { - it("sets X-Content-Type-Options to nosniff", async () => { - const res = await request(app).get("/api/v1/health"); - expect(res.headers["x-content-type-options"]).toBe("nosniff"); - }); - - it("sets X-Frame-Options to SAMEORIGIN", async () => { - const res = await request(app).get("/api/v1/health"); - expect(res.headers["x-frame-options"]).toBe("SAMEORIGIN"); - }); - - it("removes X-Powered-By header", async () => { - const res = await request(app).get("/api/v1/health"); - expect(res.headers).not.toHaveProperty("x-powered-by"); - }); - - it("sets Content-Security-Policy", async () => { - const res = await request(app).get("/api/v1/health"); - expect(res.headers).toHaveProperty("content-security-policy"); - }); -}); - -describe("auth rate limiting", () => { - it("returns 429 after exceeding the auth limit", async () => { - const testApp = createApp(); - const limit = 20; - for (let i = 0; i < limit; i++) { - await request(testApp).post("/api/auth/sign-in"); - } - const res = await request(testApp).post("/api/auth/sign-in"); - expect(res.status).toBe(429); - }); -}); diff --git a/apps/api/src/app.ts b/apps/api/src/app.ts index ad9f509..93d1864 100644 --- a/apps/api/src/app.ts +++ b/apps/api/src/app.ts @@ -1,33 +1,23 @@ import express from "express"; import type { Express } from "express"; import { toNodeHandler } from "better-auth/node"; -import cors from "cors"; -import helmet from "helmet"; import { auth } from "./lib/auth.js"; -import { createApiRouter } from "./routes/apiRouter.js"; -import { InMemoryGameSessionStore } from "./gameSessionStore/index.js"; +import { apiRouter } from "./routes/apiRouter.js"; import { errorHandler } from "./middleware/errorHandler.js"; -import { authLimiter } from "./middleware/rateLimiters.js"; +import cors from "cors"; export function createApp() { const app: Express = express(); - app.set("trust proxy", 1); - app.use(helmet()); - app.use( cors({ origin: process.env["CORS_ORIGIN"] || "http://localhost:5173", credentials: true, }), ); - app.use("/api/auth", authLimiter); app.all("/api/auth/*splat", toNodeHandler(auth)); app.use(express.json()); - - const store = new InMemoryGameSessionStore(); - app.use("/api/v1", createApiRouter(store)); - + app.use("/api/v1", apiRouter); app.use(errorHandler); return app; diff --git a/apps/api/src/controllers/gameController.test.ts b/apps/api/src/controllers/gameController.test.ts index 0351c2a..7c4d563 100644 --- a/apps/api/src/controllers/gameController.test.ts +++ b/apps/api/src/controllers/gameController.test.ts @@ -60,7 +60,7 @@ const validBody = { target_language: "it", pos: "noun", difficulty: "easy", - rounds: 3, + rounds: "3", }; const fakeTerms = [ @@ -110,26 +110,6 @@ describe("POST /api/v1/game/start", () => { expect(res.status).toBe(400); expect(body.success).toBe(false); }); - - it("returns 422 when no terms are found for the given filters", async () => { - mockGetGameTerms.mockResolvedValue([]); - - const res = await request(app).post("/api/v1/game/start").send(validBody); - const body = res.body as ErrorResponse; - expect(res.status).toBe(422); - expect(body.success).toBe(false); - }); - - it("returns a sanitised error message when the body is invalid", async () => { - const res = await request(app) - .post("/api/v1/game/start") - .send({ ...validBody, difficulty: "impossible" }); - const body = res.body as ErrorResponse; - expect(res.status).toBe(400); - expect(body.error).toBe("Invalid game settings"); - expect(body.error).not.toContain("Invalid literal value"); - expect(body.error).not.toContain("Invalid enum value"); - }); }); describe("POST /api/v1/game/answer", () => { @@ -178,7 +158,7 @@ describe("POST /api/v1/game/answer", () => { expect(body.error).toContain("Game session not found"); }); - it("returns 409 when the question does not exist in the session", async () => { + it("returns 404 when the question does not exist in the session", async () => { const startRes = await request(app) .post("/api/v1/game/start") .send(validBody); @@ -193,26 +173,8 @@ describe("POST /api/v1/game/answer", () => { selectedOptionId: 0, }); const body = res.body as ErrorResponse; - expect(res.status).toBe(409); - expect(body.success).toBe(false); - expect(body.error).toContain("Question already answered"); - }); - - it("returns 400 when a field has an invalid value", async () => { - const res = await request(app) - .post("/api/v1/game/start") - .send({ ...validBody, difficulty: "impossible" }); - const body = res.body as ErrorResponse; - expect(res.status).toBe(400); - expect(body.success).toBe(false); - }); - - it("returns 400 when rounds has an invalid value", async () => { - const res = await request(app) - .post("/api/v1/game/start") - .send({ ...validBody, rounds: "invalid" }); - const body = res.body as ErrorResponse; - expect(res.status).toBe(400); + expect(res.status).toBe(404); expect(body.success).toBe(false); + expect(body.error).toContain("Question not found"); }); }); diff --git a/apps/api/src/controllers/gameController.ts b/apps/api/src/controllers/gameController.ts index 2a0416e..fa43369 100644 --- a/apps/api/src/controllers/gameController.ts +++ b/apps/api/src/controllers/gameController.ts @@ -1,50 +1,42 @@ -import type { Response, NextFunction } from "express"; -import type { AuthenticatedRequest } from "../types/express.js"; +import type { Request, Response, NextFunction } from "express"; import { GameRequestSchema, AnswerSubmissionSchema } from "@lila/shared"; import { createGameSession, evaluateAnswer } from "../services/gameService.js"; import { ValidationError } from "../errors/AppError.js"; -import type { GameSessionStore } from "../gameSessionStore/index.js"; -export const createGameController = (store: GameSessionStore) => ({ - createGame: async ( - req: AuthenticatedRequest, - res: Response, - next: NextFunction, - ) => { - try { - const gameSettings = GameRequestSchema.safeParse(req.body); - if (!gameSettings.success) { - throw new ValidationError("Invalid game settings"); - } - const gameQuestions = await createGameSession( - gameSettings.data, - store, - req.session.user.id, - ); - res.json({ success: true, data: gameQuestions }); - } catch (error) { - next(error); - } - }, +export const createGame = async ( + req: Request, + res: Response, + next: NextFunction, +) => { + try { + const gameSettings = GameRequestSchema.safeParse(req.body); - submitAnswer: async ( - req: AuthenticatedRequest, - res: Response, - next: NextFunction, - ) => { - try { - const submission = AnswerSubmissionSchema.safeParse(req.body); - if (!submission.success) { - throw new ValidationError("Invalid answer submission"); - } - const result = await evaluateAnswer( - submission.data, - store, - req.session.user.id, - ); - res.json({ success: true, data: result }); - } catch (error) { - next(error); + if (!gameSettings.success) { + throw new ValidationError(gameSettings.error.message); } - }, -}); + + const gameQuestions = await createGameSession(gameSettings.data); + res.json({ success: true, data: gameQuestions }); + } catch (error) { + next(error); + } +}; + +export const submitAnswer = async ( + req: Request, + res: Response, + next: NextFunction, +) => { + try { + const submission = AnswerSubmissionSchema.safeParse(req.body); + + if (!submission.success) { + throw new ValidationError(submission.error.message); + } + + const result = await evaluateAnswer(submission.data); + res.json({ success: true, data: result }); + } catch (error) { + next(error); + } +}; diff --git a/apps/api/src/errors/AppError.ts b/apps/api/src/errors/AppError.ts index bc5a92a..4677d9f 100644 --- a/apps/api/src/errors/AppError.ts +++ b/apps/api/src/errors/AppError.ts @@ -25,9 +25,3 @@ export class ConflictError extends AppError { super(message, 409); } } - -export class UnprocessableEntityError extends AppError { - constructor(message: string) { - super(message, 422); - } -} diff --git a/apps/api/src/gameSessionStore/GameSessionStore.ts b/apps/api/src/gameSessionStore/GameSessionStore.ts index 3e6c5d2..766f26c 100644 --- a/apps/api/src/gameSessionStore/GameSessionStore.ts +++ b/apps/api/src/gameSessionStore/GameSessionStore.ts @@ -1,15 +1,7 @@ -export type GameSessionData = { - answers: Map; - userId: string; -}; +export type GameSessionData = { answers: Map }; export interface GameSessionStore { - create( - sessionId: string, - data: GameSessionData, - ttlMs: number, - ): Promise; + create(sessionId: string, data: GameSessionData): Promise; get(sessionId: string): Promise; - update(sessionId: string, data: GameSessionData): Promise; delete(sessionId: string): Promise; } diff --git a/apps/api/src/gameSessionStore/InMemoryGameSessionStore.test.ts b/apps/api/src/gameSessionStore/InMemoryGameSessionStore.test.ts deleted file mode 100644 index d08be1f..0000000 --- a/apps/api/src/gameSessionStore/InMemoryGameSessionStore.test.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { describe, it, expect, beforeEach } from "vitest"; -import { InMemoryGameSessionStore } from "./InMemoryGameSessionStore.js"; - -describe("InMemoryGameSessionStore", () => { - let store: InMemoryGameSessionStore; - - beforeEach(() => { - store = new InMemoryGameSessionStore(); - }); - - it("returns null for a non-existent session", async () => { - const result = await store.get("00000000-0000-0000-0000-000000000000"); - expect(result).toBeNull(); - }); - - it("returns session data after creation", async () => { - const data = { - answers: new Map([["q1", { correctOptionId: 2 }]]), - userId: "user-1", - }; - await store.create("session-1", data, 60_000); - const result = await store.get("session-1"); - expect(result).toEqual(data); - }); - - it("returns null after the session is deleted", async () => { - const data = { - answers: new Map([["q1", { correctOptionId: 2 }]]), - userId: "user-1", - }; - await store.create("session-1", data, 60_000); - await store.delete("session-1"); - const result = await store.get("session-1"); - expect(result).toBeNull(); - }); - - it("returns null after TTL expires", async () => { - const data = { - answers: new Map([["q1", { correctOptionId: 2 }]]), - userId: "user-1", - }; - await store.create("session-1", data, 1); - await new Promise((resolve) => setTimeout(resolve, 10)); - const result = await store.get("session-1"); - expect(result).toBeNull(); - }); - - it("returns session data before TTL expires", async () => { - const data = { - answers: new Map([["q1", { correctOptionId: 2 }]]), - userId: "user-1", - }; - await store.create("session-1", data, 60_000); - const result = await store.get("session-1"); - expect(result).not.toBeNull(); - }); - - it("update persists modified session data", async () => { - const data = { - answers: new Map([["q1", { correctOptionId: 2 }]]), - userId: "user-1", - }; - - await store.create("session-1", data, 60_000); - - const updated = { - answers: new Map([["q2", { correctOptionId: 1 }]]), - userId: "user-1", - }; - await store.update("session-1", updated); - - const result = await store.get("session-1"); - expect(result).toEqual(updated); - }); -}); diff --git a/apps/api/src/gameSessionStore/InMemoryGameSessionStore.ts b/apps/api/src/gameSessionStore/InMemoryGameSessionStore.ts index 71e4b4c..f29ca59 100644 --- a/apps/api/src/gameSessionStore/InMemoryGameSessionStore.ts +++ b/apps/api/src/gameSessionStore/InMemoryGameSessionStore.ts @@ -1,34 +1,15 @@ import type { GameSessionStore, GameSessionData } from "./GameSessionStore.js"; -type SessionEntry = { data: GameSessionData; expiresAt: number }; - export class InMemoryGameSessionStore implements GameSessionStore { - private sessions = new Map(); + private sessions = new Map(); - create( - sessionId: string, - data: GameSessionData, - ttlMs: number, - ): Promise { - this.sessions.set(sessionId, { data, expiresAt: Date.now() + ttlMs }); + create(sessionId: string, data: GameSessionData): Promise { + this.sessions.set(sessionId, data); return Promise.resolve(); } get(sessionId: string): Promise { - const entry = this.sessions.get(sessionId); - if (!entry) return Promise.resolve(null); - if (Date.now() > entry.expiresAt) { - this.sessions.delete(sessionId); - return Promise.resolve(null); - } - return Promise.resolve(entry.data); - } - - update(sessionId: string, data: GameSessionData): Promise { - const entry = this.sessions.get(sessionId); - if (!entry) return Promise.resolve(); - this.sessions.set(sessionId, { data, expiresAt: entry.expiresAt }); - return Promise.resolve(); + return Promise.resolve(this.sessions.get(sessionId) ?? null); } delete(sessionId: string): Promise { diff --git a/apps/api/src/lib/auth.ts b/apps/api/src/lib/auth.ts index fe41e35..8e2b818 100644 --- a/apps/api/src/lib/auth.ts +++ b/apps/api/src/lib/auth.ts @@ -1,11 +1,8 @@ import { betterAuth } from "better-auth"; import { drizzleAdapter } from "better-auth/adapters/drizzle"; -import { Resend } from "resend"; import { db } from "@lila/db"; import * as schema from "@lila/db/schema"; -const emailFrom = process.env["EMAIL_FROM"] ?? "noreply@lilastudy.com"; - export const auth = betterAuth({ baseURL: process.env["BETTER_AUTH_URL"] || "http://localhost:3000", advanced: { @@ -19,44 +16,6 @@ export const auth = betterAuth({ }, }, database: drizzleAdapter(db, { provider: "pg", schema }), - emailAndPassword: { - enabled: true, - requireEmailVerification: true, - sendResetPassword: async ({ - user, - url, - }: { - user: { email: string }; - url: string; - }) => { - const resend = new Resend(process.env["RESEND_API_KEY"]); - await resend.emails.send({ - from: emailFrom, - to: user.email, - subject: "Reset your lila password", - html: `

Click here to reset your password. This link expires in 1 hour.

`, - }); - }, - }, - emailVerification: { - sendOnSignUp: true, - autoSignInAfterVerification: true, - sendVerificationEmail: async ({ - user, - url, - }: { - user: { email: string }; - url: string; - }) => { - const resend = new Resend(process.env["RESEND_API_KEY"]); - await resend.emails.send({ - from: emailFrom, - to: user.email, - subject: "Verify your lila account", - html: `

Click here to verify your email address.

`, - }); - }, - }, trustedOrigins: [process.env["CORS_ORIGIN"] || "http://localhost:5173"], socialProviders: { google: { diff --git a/apps/api/src/lib/utils.ts b/apps/api/src/lib/utils.ts deleted file mode 100644 index 4912c8c..0000000 --- a/apps/api/src/lib/utils.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const shuffleArray = (array: T[]): T[] => { - const result = [...array]; - for (let i = result.length - 1; i > 0; i--) { - const j = Math.floor(Math.random() * (i + 1)); - const temp = result[i]!; - result[i] = result[j]!; - result[j] = temp; - } - return result; -}; diff --git a/apps/api/src/middleware/rateLimiters.test.ts b/apps/api/src/middleware/rateLimiters.test.ts deleted file mode 100644 index 3bcccbb..0000000 --- a/apps/api/src/middleware/rateLimiters.test.ts +++ /dev/null @@ -1,200 +0,0 @@ -import express from "express"; -import request from "supertest"; -import { describe, it, expect, beforeEach } from "vitest"; -import { authLimiter, gameLimiter, lobbyLimiter } from "./rateLimiters.js"; - -import type { Session, User } from "better-auth"; - -function createTestApp() { - const app = express(); - app.set("trust proxy", 1); - app.use("/api/auth", authLimiter); - app.all("/api/auth/*splat", (_req, res) => { - res.status(200).json({ success: true }); - }); - return app; -} - -describe("authLimiter", () => { - let app: ReturnType; - - beforeEach(() => { - app = createTestApp(); - }); - - it("allows requests under the limit through on sensitive endpoints", async () => { - const res = await request(app).post("/api/auth/sign-in"); - expect(res.status).toBe(200); - }); - - it("returns 429 after exceeding the limit on sensitive endpoints", async () => { - const limit = 20; - for (let i = 0; i < limit; i++) { - await request(app).post("/api/auth/sign-in"); - } - const res = await request(app).post("/api/auth/sign-in"); - expect(res.status).toBe(429); - }); - - it("does not rate limit /get-session", async () => { - const limit = 20; - for (let i = 0; i < limit + 5; i++) { - await request(app).get("/api/auth/get-session"); - } - const res = await request(app).get("/api/auth/get-session"); - expect(res.status).toBe(200); - }); - - it("does not rate limit /sign-out", async () => { - const limit = 20; - for (let i = 0; i < limit + 5; i++) { - await request(app).post("/api/auth/sign-out"); - } - const res = await request(app).post("/api/auth/sign-out"); - expect(res.status).toBe(200); - }); - - it("does not rate limit OAuth callbacks", async () => { - const limit = 20; - for (let i = 0; i < limit + 5; i++) { - await request(app).get("/api/auth/callback/google"); - } - const res = await request(app).get("/api/auth/callback/google"); - expect(res.status).toBe(200); - }); - - it("sets RateLimit headers on sensitive responses", async () => { - const res = await request(app).post("/api/auth/sign-in"); - expect(res.headers).toHaveProperty("ratelimit"); - }); -}); - -function fakeAuth(userId: string) { - return ( - req: express.Request, - _res: express.Response, - next: express.NextFunction, - ) => { - req.session = { session: {} as Session, user: { id: userId } as User }; - next(); - }; -} - -function createGameTestApp(userId = "user-1") { - const app = express(); - app.set("trust proxy", 1); - app.use(fakeAuth(userId)); - app.use(gameLimiter); - app.post("/game/start", (_req, res) => - res.status(200).json({ success: true }), - ); - app.post("/game/answer", (_req, res) => - res.status(200).json({ success: true }), - ); - return app; -} - -describe("gameLimiter", () => { - it("allows requests under the limit through", async () => { - const app = createGameTestApp(); - const res = await request(app).post("/game/start"); - expect(res.status).toBe(200); - }); - - it("returns 429 after exceeding the limit", async () => { - const app = createGameTestApp(); - const limit = 150; - for (let i = 0; i < limit; i++) { - await request(app).post("/game/answer"); - } - const res = await request(app).post("/game/answer"); - expect(res.status).toBe(429); - expect(res.body).toEqual({ - success: false, - error: "Too many requests, please try again later.", - }); - }); - - it("tracks limits per user, not per IP", async () => { - const app = express(); - app.set("trust proxy", 1); - - // Two routes, same limiter, different users - app.use("/user1", fakeAuth("user-1"), gameLimiter, (_req, res) => - res.status(200).json({ success: true }), - ); - app.use("/user2", fakeAuth("user-2"), gameLimiter, (_req, res) => - res.status(200).json({ success: true }), - ); - - const limit = 150; - for (let i = 0; i < limit; i++) { - await request(app).post("/user1"); - } - - // user-1 is exhausted - const blocked = await request(app).post("/user1"); - expect(blocked.status).toBe(429); - - // user-2 is unaffected - const allowed = await request(app).post("/user2"); - expect(allowed.status).toBe(200); - }); -}); - -function createLobbyTestApp(userId = "user-1") { - const app = express(); - app.set("trust proxy", 1); - app.use(fakeAuth(userId)); - app.use(lobbyLimiter); - app.post("/lobbies", (_req, res) => res.status(200).json({ success: true })); - app.post("/lobbies/:code/join", (_req, res) => - res.status(200).json({ success: true }), - ); - return app; -} - -describe("lobbyLimiter", () => { - it("allows requests under the limit through", async () => { - const app = createLobbyTestApp(); - const res = await request(app).post("/lobbies"); - expect(res.status).toBe(200); - }); - - it("returns 429 after exceeding the limit", async () => { - const app = createLobbyTestApp(); - const limit = 20; - for (let i = 0; i < limit; i++) { - await request(app).post("/lobbies"); - } - const res = await request(app).post("/lobbies"); - expect(res.status).toBe(429); - expect(res.body).toEqual({ - success: false, - error: "Too many requests, please try again later.", - }); - }); - - it("tracks limits per user, not per IP", async () => { - const app = express(); - app.set("trust proxy", 1); - - app.use("/user1", fakeAuth("user-1"), lobbyLimiter, (_req, res) => - res.status(200).json({ success: true }), - ); - app.use("/user2", fakeAuth("user-2"), lobbyLimiter, (_req, res) => - res.status(200).json({ success: true }), - ); - - const limit = 20; - for (let i = 0; i < limit; i++) { - await request(app).post("/user1"); - } - - const blocked = await request(app).post("/user1"); - expect(blocked.status).toBe(429); - - const allowed = await request(app).post("/user2"); - expect(allowed.status).toBe(200); - }); -}); diff --git a/apps/api/src/middleware/rateLimiters.ts b/apps/api/src/middleware/rateLimiters.ts deleted file mode 100644 index 2f2eaf6..0000000 --- a/apps/api/src/middleware/rateLimiters.ts +++ /dev/null @@ -1,53 +0,0 @@ -import rateLimit from "express-rate-limit"; -import type { Request } from "express"; - -// TODO: When Valkey is wired up, swap the default in-memory store for -// rate-limit-redis to persist limits across restarts: -// -// import { RedisStore } from "rate-limit-redis"; -// import { valkey } from "../lib/valkey.js"; -// Then add to each limiter: store: new RedisStore({ sendCommand: (...args) => valkey.call(...args) }) - -export const authLimiter = rateLimit({ - windowMs: 15 * 60 * 1000, - limit: 20, - standardHeaders: "draft-8", - legacyHeaders: false, - skip: (req) => { - const path = req.path; - return ( - path.includes("/get-session") || - path.includes("/sign-out") || - path.startsWith("/callback/") || - path.includes("/callback/") - ); - }, - message: { - success: false, - error: "Too many requests, please try again later.", - }, -}); - -export const gameLimiter = rateLimit({ - windowMs: 15 * 60 * 1000, - limit: 150, - standardHeaders: "draft-8", - legacyHeaders: false, - keyGenerator: (req: Request) => req.session!.user.id, - message: { - success: false, - error: "Too many requests, please try again later.", - }, -}); - -export const lobbyLimiter = rateLimit({ - windowMs: 15 * 60 * 1000, - limit: 20, - standardHeaders: "draft-8", - legacyHeaders: false, - keyGenerator: (req: Request) => req.session!.user.id, - message: { - success: false, - error: "Too many requests, please try again later.", - }, -}); diff --git a/apps/api/src/routes/apiRouter.ts b/apps/api/src/routes/apiRouter.ts index a0ea8d7..f5ebd01 100644 --- a/apps/api/src/routes/apiRouter.ts +++ b/apps/api/src/routes/apiRouter.ts @@ -1,16 +1,11 @@ import express from "express"; -import type { Router } from "express"; +import { Router } from "express"; import { healthRouter } from "./healthRouter.js"; -import { createGameRouter } from "./gameRouter.js"; +import { gameRouter } from "./gameRouter.js"; import { lobbyRouter } from "./lobbyRouter.js"; -import type { GameSessionStore } from "../gameSessionStore/index.js"; -export const createApiRouter = (store: GameSessionStore): Router => { - const router = express.Router(); +export const apiRouter: Router = express.Router(); - router.use("/health", healthRouter); - router.use("/game", createGameRouter(store)); - router.use("/lobbies", lobbyRouter); - - return router; -}; +apiRouter.use("/health", healthRouter); +apiRouter.use("/game", gameRouter); +apiRouter.use("/lobbies", lobbyRouter); diff --git a/apps/api/src/routes/gameRouter.ts b/apps/api/src/routes/gameRouter.ts index a40622d..f65bfb6 100644 --- a/apps/api/src/routes/gameRouter.ts +++ b/apps/api/src/routes/gameRouter.ts @@ -1,19 +1,10 @@ import express from "express"; import type { Router } from "express"; -import { createGameController } from "../controllers/gameController.js"; +import { createGame, submitAnswer } from "../controllers/gameController.js"; import { requireAuth } from "../middleware/authMiddleware.js"; -import { gameLimiter } from "../middleware/rateLimiters.js"; -import type { GameSessionStore } from "../gameSessionStore/index.js"; -export const createGameRouter = (store: GameSessionStore): Router => { - const router = express.Router(); - const controller = createGameController(store); +export const gameRouter: Router = express.Router(); - router.use(requireAuth); - router.use(gameLimiter); - - router.post("/start", controller.createGame as express.RequestHandler); - router.post("/answer", controller.submitAnswer as express.RequestHandler); - - return router; -}; +gameRouter.use(requireAuth); +gameRouter.post("/start", createGame); +gameRouter.post("/answer", submitAnswer); diff --git a/apps/api/src/routes/lobbyRouter.ts b/apps/api/src/routes/lobbyRouter.ts index 5cc24c9..5bd82dd 100644 --- a/apps/api/src/routes/lobbyRouter.ts +++ b/apps/api/src/routes/lobbyRouter.ts @@ -5,12 +5,10 @@ import { joinLobbyHandler, } from "../controllers/lobbyController.js"; import { requireAuth } from "../middleware/authMiddleware.js"; -import { lobbyLimiter } from "../middleware/rateLimiters.js"; export const lobbyRouter: Router = express.Router(); lobbyRouter.use(requireAuth); -lobbyRouter.use(lobbyLimiter); lobbyRouter.post("/", createLobbyHandler); lobbyRouter.post("/:code/join", joinLobbyHandler); diff --git a/apps/api/src/services/gameService.test.ts b/apps/api/src/services/gameService.test.ts index 76fa3a2..d1453f4 100644 --- a/apps/api/src/services/gameService.test.ts +++ b/apps/api/src/services/gameService.test.ts @@ -5,7 +5,6 @@ vi.mock("@lila/db", () => ({ getGameTerms: vi.fn(), getDistractors: vi.fn() })); import { getGameTerms, getDistractors } from "@lila/db"; import { createGameSession, evaluateAnswer } from "./gameService.js"; -import { InMemoryGameSessionStore } from "../gameSessionStore/index.js"; const mockGetGameTerms = vi.mocked(getGameTerms); const mockGetDistractors = vi.mocked(getDistractors); @@ -15,7 +14,7 @@ const validRequest: GameRequest = { target_language: "it", pos: "noun", difficulty: "easy", - rounds: 3, + rounds: "3", }; const fakeTerms = [ @@ -32,32 +31,19 @@ const fakeTerms = [ beforeEach(() => { vi.clearAllMocks(); mockGetGameTerms.mockResolvedValue(fakeTerms); - mockGetDistractors.mockResolvedValue([ - "wrong1", - "wrong2", - "wrong3", - "wrong4", - "wrong5", - "wrong6", - ]); + mockGetDistractors.mockResolvedValue(["wrong1", "wrong2", "wrong3"]); }); describe("createGameSession", () => { - let store: InMemoryGameSessionStore; - - beforeEach(() => { - store = new InMemoryGameSessionStore(); - }); - it("returns a session with the correct number of questions", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + const session = await createGameSession(validRequest); expect(session.sessionId).toBeDefined(); expect(session.questions).toHaveLength(3); }); it("each question has exactly 4 options", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + const session = await createGameSession(validRequest); for (const question of session.questions) { expect(question.options).toHaveLength(4); @@ -65,14 +51,14 @@ describe("createGameSession", () => { }); it("each question has a unique questionId", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + const session = await createGameSession(validRequest); const ids = session.questions.map((q) => q.questionId); expect(new Set(ids).size).toBe(ids.length); }); it("options have sequential optionIds 0-3", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + const session = await createGameSession(validRequest); for (const question of session.questions) { const optionIds = question.options.map((o) => o.optionId); @@ -81,7 +67,7 @@ describe("createGameSession", () => { }); it("the correct answer is always among the options", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + const session = await createGameSession(validRequest); for (let i = 0; i < session.questions.length; i++) { const question = session.questions[i]!; @@ -92,26 +78,24 @@ describe("createGameSession", () => { } }); - it("correct answer appears exactly once even if getDistractors returns a duplicate", async () => { - mockGetDistractors.mockResolvedValueOnce([ - "cane", - "wrong2", - "wrong3", - "wrong4", - "wrong5", - "wrong6", - ]); + it("distractors are never the correct answer", async () => { + const session = await createGameSession(validRequest); - const session = await createGameSession(validRequest, store, "user-1"); - const question = session.questions[0]!; - const optionTexts = question.options.map((o) => o.text); + for (let i = 0; i < session.questions.length; i++) { + const question = session.questions[i]!; + const correctText = fakeTerms[i]!.targetText; + const distractorTexts = question.options + .map((o) => o.text) + .filter((t) => t !== correctText); - expect(optionTexts.filter((t) => t === "cane")).toHaveLength(1); - expect(question.options).toHaveLength(4); + for (const text of distractorTexts) { + expect(text).not.toBe(correctText); + } + } }); it("sets the prompt from the source text", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + const session = await createGameSession(validRequest); expect(session.questions[0]!.prompt).toBe("dog"); expect(session.questions[1]!.prompt).toBe("cat"); @@ -119,14 +103,14 @@ describe("createGameSession", () => { }); it("passes gloss through (null or string)", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + const session = await createGameSession(validRequest); expect(session.questions[0]!.gloss).toBeNull(); expect(session.questions[2]!.gloss).toBe("a building for living in"); }); it("calls getGameTerms with the correct arguments", async () => { - await createGameSession(validRequest, store, "user-1"); + await createGameSession(validRequest); expect(mockGetGameTerms).toHaveBeenCalledWith( "en", @@ -138,83 +122,24 @@ describe("createGameSession", () => { }); it("calls getDistractors once per question", async () => { - await createGameSession(validRequest, store, "user-1"); + await createGameSession(validRequest); expect(mockGetDistractors).toHaveBeenCalledTimes(3); }); - - it("propagates unexpected errors from getGameTerms", async () => { - mockGetGameTerms.mockRejectedValue(new Error("connection refused")); - - await expect( - createGameSession(validRequest, store, "user-1"), - ).rejects.toThrow("connection refused"); - }); - - it("propagates getDistractors failure", async () => { - mockGetDistractors.mockRejectedValue(new Error("db timeout")); - - await expect( - createGameSession(validRequest, store, "user-1"), - ).rejects.toThrow("db timeout"); - }); - - it("throws when fewer than 3 unique distractors remain after deduplication", async () => { - mockGetDistractors.mockResolvedValueOnce([ - "cane", - "cane", - "cane", - "cane", - "cane", - "cane", - ]); - - await expect( - createGameSession(validRequest, store, "user-1"), - ).rejects.toThrow("Not enough unique distractors"); - }); - - it("duplicate distractors are deduplicated against each other", async () => { - mockGetDistractors.mockResolvedValueOnce([ - "wrong1", - "wrong1", - "wrong1", - "wrong2", - "wrong3", - "wrong4", - ]); - - const session = await createGameSession(validRequest, store, "user-1"); - const question = session.questions[0]!; - const optionTexts = question.options.map((o) => o.text); - - expect(new Set(optionTexts).size).toBe(4); - expect(question.options).toHaveLength(4); - }); }); describe("evaluateAnswer", () => { - let store: InMemoryGameSessionStore; - - beforeEach(() => { - store = new InMemoryGameSessionStore(); - }); - it("returns isCorrect: true when the correct option is selected", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + const session = await createGameSession(validRequest); const question = session.questions[0]!; const correctText = fakeTerms[0]!.targetText; const correctOption = question.options.find((o) => o.text === correctText)!; - const result = await evaluateAnswer( - { - sessionId: session.sessionId, - questionId: question.questionId, - selectedOptionId: correctOption.optionId, - }, - store, - "user-1", - ); + const result = await evaluateAnswer({ + sessionId: session.sessionId, + questionId: question.questionId, + selectedOptionId: correctOption.optionId, + }); expect(result.isCorrect).toBe(true); expect(result.correctOptionId).toBe(correctOption.optionId); @@ -222,21 +147,17 @@ describe("evaluateAnswer", () => { }); it("returns isCorrect: false when a wrong option is selected", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + const session = await createGameSession(validRequest); const question = session.questions[0]!; const correctText = fakeTerms[0]!.targetText; const correctOption = question.options.find((o) => o.text === correctText)!; const wrongOption = question.options.find((o) => o.text !== correctText)!; - const result = await evaluateAnswer( - { - sessionId: session.sessionId, - questionId: question.questionId, - selectedOptionId: wrongOption.optionId, - }, - store, - "user-1", - ); + const result = await evaluateAnswer({ + sessionId: session.sessionId, + questionId: question.questionId, + selectedOptionId: wrongOption.optionId, + }); expect(result.isCorrect).toBe(false); expect(result.correctOptionId).toBe(correctOption.optionId); @@ -250,13 +171,13 @@ describe("evaluateAnswer", () => { selectedOptionId: 0, }; - await expect(evaluateAnswer(submission, store, "user-1")).rejects.toThrow( + await expect(evaluateAnswer(submission)).rejects.toThrow( "Game session not found", ); }); - it("throws ConflictError for a non-existent question", async () => { - const session = await createGameSession(validRequest, store, "user-1"); + it("throws NotFoundError for a non-existent question", async () => { + const session = await createGameSession(validRequest); const submission: AnswerSubmission = { sessionId: session.sessionId, @@ -264,71 +185,8 @@ describe("evaluateAnswer", () => { selectedOptionId: 0, }; - await expect( - evaluateAnswer(submission, store, "user-1"), - ).rejects.toMatchObject({ statusCode: 409 }); - }); - - it("throws ConflictError when the same question is submitted twice", async () => { - const session = await createGameSession(validRequest, store, "user-1"); - const question = session.questions[0]!; - - await evaluateAnswer( - { - sessionId: session.sessionId, - questionId: question.questionId, - selectedOptionId: 0, - }, - store, - "user-1", + await expect(evaluateAnswer(submission)).rejects.toThrow( + "Question not found", ); - - await expect( - evaluateAnswer( - { - sessionId: session.sessionId, - questionId: question.questionId, - selectedOptionId: 0, - }, - store, - "user-1", - ), - ).rejects.toMatchObject({ statusCode: 409 }); - }); - - it("deletes the session after the last question is answered", async () => { - const session = await createGameSession(validRequest, store, "user-1"); - - for (const question of session.questions) { - await evaluateAnswer( - { - sessionId: session.sessionId, - questionId: question.questionId, - selectedOptionId: 0, - }, - store, - "user-1", - ); - } - - await expect( - evaluateAnswer( - { - sessionId: session.sessionId, - questionId: session.questions[0]!.questionId, - selectedOptionId: 0, - }, - store, - "user-1", - ), - ).rejects.toThrow("Game session not found"); - }); - - it("throws UnprocessableEntityError when getGameTerms returns no terms", async () => { - mockGetGameTerms.mockResolvedValue([]); - - await expect( - createGameSession(validRequest, store, "user-1"), - ).rejects.toMatchObject({ statusCode: 422 }); }); }); diff --git a/apps/api/src/services/gameService.ts b/apps/api/src/services/gameService.ts index ad34c72..b015271 100644 --- a/apps/api/src/services/gameService.ts +++ b/apps/api/src/services/gameService.ts @@ -8,57 +8,38 @@ import type { AnswerSubmission, AnswerResult, } from "@lila/shared"; -import type { GameSessionStore } from "../gameSessionStore/index.js"; -import { - NotFoundError, - ConflictError, - UnprocessableEntityError, -} from "../errors/AppError.js"; -import { shuffleArray } from "../lib/utils.js"; +import { InMemoryGameSessionStore } from "../gameSessionStore/index.js"; +import { NotFoundError } from "../errors/AppError.js"; + +const gameSessionStore = new InMemoryGameSessionStore(); export const createGameSession = async ( request: GameRequest, - store: GameSessionStore, - userId: string, ): Promise => { - const terms = await getGameTerms( + const correctAnswers = await getGameTerms( request.source_language, request.target_language, request.pos, request.difficulty, - request.rounds, + Number(request.rounds), ); - if (terms.length === 0) { - throw new UnprocessableEntityError("No terms found for the given filters"); - } - - const answerKey = new Map(); + const answerKey = new Map(); const questions: GameQuestion[] = await Promise.all( - terms.map(async (term) => { + correctAnswers.map(async (correctAnswer) => { const distractorTexts = await getDistractors( - term.termId, - term.targetText, + correctAnswer.termId, + correctAnswer.targetText, request.target_language, request.pos, request.difficulty, - 6, + 3, ); - const uniqueDistractors = [ - ...new Set(distractorTexts.filter((t) => t !== term.targetText)), - ]; - - if (uniqueDistractors.length < 3) { - throw new Error( - `Not enough unique distractors for term: ${term.targetText}`, - ); - } - - const optionTexts = [term.targetText, ...uniqueDistractors.slice(0, 3)]; - const shuffledTexts = shuffleArray(optionTexts); - const correctOptionId = shuffledTexts.indexOf(term.targetText); + const optionTexts = [correctAnswer.targetText, ...distractorTexts]; + const shuffledTexts = shuffle(optionTexts); + const correctOptionId = shuffledTexts.indexOf(correctAnswer.targetText); const options: AnswerOption[] = shuffledTexts.map((text, index) => ({ optionId: index, @@ -66,58 +47,53 @@ export const createGameSession = async ( })); const questionId = randomUUID(); - answerKey.set(questionId, { correctOptionId }); + answerKey.set(questionId, correctOptionId); return { questionId, - prompt: term.sourceText, - gloss: term.sourceGloss, + prompt: correctAnswer.sourceText, + gloss: correctAnswer.sourceGloss, options, }; }), ); const sessionId = randomUUID(); - await store.create(sessionId, { answers: answerKey, userId }, 30 * 60 * 1000); + await gameSessionStore.create(sessionId, { answers: answerKey }); return { sessionId, questions }; }; +const shuffle = (array: T[]): T[] => { + const result = [...array]; + for (let i = result.length - 1; i > 0; i--) { + const j = Math.floor(Math.random() * (i + 1)); + const temp = result[i]!; + result[i] = result[j]!; + result[j] = temp; + } + return result; +}; + export const evaluateAnswer = async ( submission: AnswerSubmission, - store: GameSessionStore, - userId: string, ): Promise => { - const session = await store.get(submission.sessionId); + const session = await gameSessionStore.get(submission.sessionId); - if (!session || session.userId !== userId) { + if (!session) { throw new NotFoundError(`Game session not found: ${submission.sessionId}`); } - const answer = session.answers.get(submission.questionId); + const correctOptionId = session.answers.get(submission.questionId); - if (answer === undefined) { - throw new ConflictError( - `Question already answered: ${submission.questionId}`, - ); - } - - const updatedAnswers = new Map(session.answers); - updatedAnswers.delete(submission.questionId); - - if (updatedAnswers.size === 0) { - await store.delete(submission.sessionId); - } else { - await store.update(submission.sessionId, { - answers: updatedAnswers, - userId: session.userId, - }); + if (correctOptionId === undefined) { + throw new NotFoundError(`Question not found: ${submission.questionId}`); } return { questionId: submission.questionId, - isCorrect: submission.selectedOptionId === answer.correctOptionId, - correctOptionId: answer.correctOptionId, + isCorrect: submission.selectedOptionId === correctOptionId, + correctOptionId, selectedOptionId: submission.selectedOptionId, }; }; diff --git a/apps/api/src/services/lobbyService.test.ts b/apps/api/src/services/lobbyService.test.ts index c5de043..c998c12 100644 --- a/apps/api/src/services/lobbyService.test.ts +++ b/apps/api/src/services/lobbyService.test.ts @@ -87,14 +87,6 @@ describe("createLobby", () => { "Could not generate a unique lobby code", ); }); - - it("re-throws non-unique-violation errors immediately", async () => { - const dbError = new Error("connection refused"); - mockCreateLobby.mockRejectedValue(dbError); - - await expect(createLobby("user-1")).rejects.toThrow("connection refused"); - expect(mockCreateLobby).toHaveBeenCalledTimes(1); - }); }); describe("joinLobby", () => { @@ -181,22 +173,4 @@ describe("joinLobby", () => { "Lobby is full", ); }); - - it("throws ConflictError when addPlayer returns falsy (race condition)", async () => { - mockAddPlayer.mockResolvedValue(undefined); - - await expect(joinLobby("ABC123", "user-2")).rejects.toThrow( - "Lobby is no longer available", - ); - }); - - it("throws AppError when lobby disappears after addPlayer succeeds", async () => { - mockGetLobbyByCodeWithPlayers - .mockResolvedValueOnce(fakeLobbyWithPlayers) - .mockResolvedValueOnce(undefined); - - await expect(joinLobby("ABC123", "user-2")).rejects.toThrow( - "Lobby disappeared during join", - ); - }); }); diff --git a/apps/api/src/services/multiplayerGameService.test.ts b/apps/api/src/services/multiplayerGameService.test.ts deleted file mode 100644 index 2261960..0000000 --- a/apps/api/src/services/multiplayerGameService.test.ts +++ /dev/null @@ -1,125 +0,0 @@ -import { describe, it, expect, vi, beforeEach } from "vitest"; - -vi.mock("@lila/db", () => ({ getGameTerms: vi.fn(), getDistractors: vi.fn() })); - -import { getGameTerms, getDistractors } from "@lila/db"; -import { generateMultiplayerQuestions } from "./multiplayerGameService.js"; - -const mockGetGameTerms = vi.mocked(getGameTerms); -const mockGetDistractors = vi.mocked(getDistractors); - -const fakeTerms = [ - { termId: "t1", sourceText: "dog", targetText: "cane", sourceGloss: null }, - { termId: "t2", sourceText: "cat", targetText: "gatto", sourceGloss: null }, - { - termId: "t3", - sourceText: "house", - targetText: "casa", - sourceGloss: "a building for living in", - }, -]; - -beforeEach(() => { - vi.clearAllMocks(); - mockGetGameTerms.mockResolvedValue(fakeTerms); - mockGetDistractors.mockResolvedValue(["wrong1", "wrong2", "wrong3"]); -}); - -describe("generateMultiplayerQuestions", () => { - it("returns the correct number of questions", async () => { - const questions = await generateMultiplayerQuestions(); - - expect(questions).toHaveLength(3); - }); - - it("each question has exactly 4 options", async () => { - const questions = await generateMultiplayerQuestions(); - - for (const question of questions) { - expect(question.options).toHaveLength(4); - } - }); - - it("each question has a unique questionId", async () => { - const questions = await generateMultiplayerQuestions(); - const ids = questions.map((q) => q.questionId); - - expect(new Set(ids).size).toBe(ids.length); - }); - - it("options have sequential optionIds 0-3", async () => { - const questions = await generateMultiplayerQuestions(); - - for (const question of questions) { - const optionIds = question.options.map((o) => o.optionId); - expect(optionIds).toEqual([0, 1, 2, 3]); - } - }); - - it("the correct answer is always among the options", async () => { - const questions = await generateMultiplayerQuestions(); - - for (let i = 0; i < questions.length; i++) { - const question = questions[i]!; - const correctText = fakeTerms[i]!.targetText; - const optionTexts = question.options.map((o) => o.text); - - expect(optionTexts).toContain(correctText); - } - }); - - it("correctOptionId points to the option whose text matches the correct answer", async () => { - const questions = await generateMultiplayerQuestions(); - - for (let i = 0; i < questions.length; i++) { - const question = questions[i]!; - const correctText = fakeTerms[i]!.targetText; - const correctOption = question.options.find( - (o) => o.optionId === question.correctOptionId, - ); - - expect(correctOption?.text).toBe(correctText); - } - }); - - it("sets the prompt from the source text", async () => { - const questions = await generateMultiplayerQuestions(); - - expect(questions[0]!.prompt).toBe("dog"); - expect(questions[1]!.prompt).toBe("cat"); - expect(questions[2]!.prompt).toBe("house"); - }); - - it("passes gloss through (null or string)", async () => { - const questions = await generateMultiplayerQuestions(); - - expect(questions[0]!.gloss).toBeNull(); - expect(questions[2]!.gloss).toBe("a building for living in"); - }); - - it("calls getGameTerms with the multiplayer defaults", async () => { - await generateMultiplayerQuestions(); - - expect(mockGetGameTerms).toHaveBeenCalledWith( - "en", - "it", - "noun", - "easy", - 3, - ); - }); - - it("calls getDistractors once per question", async () => { - await generateMultiplayerQuestions(); - - expect(mockGetDistractors).toHaveBeenCalledTimes(3); - }); - - it("propagates unexpected errors from getGameTerms", async () => { - mockGetGameTerms.mockRejectedValue(new Error("connection refused")); - - await expect(generateMultiplayerQuestions()).rejects.toThrow( - "connection refused", - ); - }); -}); diff --git a/apps/api/src/types/express.d.ts b/apps/api/src/types/express.d.ts index da7633a..2fe1ac8 100644 --- a/apps/api/src/types/express.d.ts +++ b/apps/api/src/types/express.d.ts @@ -1,4 +1,3 @@ -import type { Request } from "express"; import type { Session, User } from "better-auth"; declare global { @@ -15,6 +14,4 @@ declare module "ws" { } } -export type AuthenticatedRequest = Request & { - session: { session: Session; user: User }; -}; +export {}; diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index dc4d137..bc18ec1 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -21,11 +21,9 @@ CMD ["pnpm", "--filter", "web", "dev", "--host"] # 4. Build FROM base AS builder WORKDIR /app -COPY pnpm-lock.yaml pnpm-workspace.yaml package.json ./ -COPY apps/web/package.json ./apps/web/ -COPY packages/shared/package.json ./packages/shared/ -RUN pnpm install --frozen-lockfile +COPY --from=deps /app/node_modules ./node_modules COPY . . +RUN pnpm install ARG VITE_API_URL ENV VITE_API_URL=$VITE_API_URL RUN pnpm --filter shared build diff --git a/apps/web/package.json b/apps/web/package.json index 8068c8f..922f6f9 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -6,8 +6,7 @@ "scripts": { "dev": "vite", "build": "tsc -b && vite build", - "preview": "vite preview", - "typecheck": "tsc --noEmit" + "preview": "vite preview" }, "dependencies": { "@lila/shared": "workspace:*", @@ -17,7 +16,6 @@ "better-auth": "^1.6.2", "react": "^19.2.4", "react-dom": "^19.2.4", - "sonner": "^2.0.7", "tailwindcss": "^4.2.2" }, "devDependencies": { diff --git a/apps/web/src/components/NotFound.tsx b/apps/web/src/components/NotFound.tsx deleted file mode 100644 index be4219d..0000000 --- a/apps/web/src/components/NotFound.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import { Link } from "@tanstack/react-router"; - -export default function NotFound() { - return ( -
-
-
-
-
- -
- - lost in translation - -
- -

- 4 - - 0 - - 4 -

- -

- This page doesn't exist. Maybe it never did - or maybe you{" "} - - just guessed wrong - - . -

- -
- - Back to home - -
-
- ); -} diff --git a/apps/web/src/components/RootError.tsx b/apps/web/src/components/RootError.tsx deleted file mode 100644 index e370317..0000000 --- a/apps/web/src/components/RootError.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import { Link } from "@tanstack/react-router"; - -interface RootErrorProps { - error: Error; - reset: () => void; -} - -export default function RootError({ error, reset }: RootErrorProps) { - return ( -
-
-
-
-
- -
- - something went wrong - -
- -

- Unexpected{" "} - - error - -

- -

- Something crashed. This has been noted —{" "} - it's not you. -

- - {import.meta.env.DEV && ( - 
-          {error.message}
-
- )} - -
- - - Back to home - -
-
- ); -} diff --git a/apps/web/src/components/RouteError.tsx b/apps/web/src/components/RouteError.tsx deleted file mode 100644 index d068eb4..0000000 --- a/apps/web/src/components/RouteError.tsx +++ /dev/null @@ -1,49 +0,0 @@ -interface RouteErrorProps { - error: Error; - reset: () => void; -} - -export default function RouteError({ error, reset }: RouteErrorProps) { - return ( -
-
-
-
-
- -
- - something went wrong - -
- -

- This page{" "} - - crashed - -

- -

- Something went wrong loading this page.{" "} - Try again or - head back home. -

- - {import.meta.env.DEV && ( - 
-          {error.message}
-
- )} - -
- -
-
- ); -} diff --git a/apps/web/src/components/auth/AuthModal.tsx b/apps/web/src/components/auth/AuthModal.tsx deleted file mode 100644 index 01b2c20..0000000 --- a/apps/web/src/components/auth/AuthModal.tsx +++ /dev/null @@ -1,249 +0,0 @@ -import { useState, useEffect } from "react"; -import { toast } from "sonner"; -import { authClient } from "../../lib/auth-client"; - -type Tab = "login" | "register"; - -type AuthModalProps = { onClose: () => void; onSuccess: () => void }; - -type LoginFormProps = { onSuccess: () => void }; - -const LoginForm = ({ onSuccess }: LoginFormProps) => { - const [email, setEmail] = useState(""); - const [password, setPassword] = useState(""); - const [isPending, setIsPending] = useState(false); - - const handleSubmit = async () => { - setIsPending(true); - await authClient.signIn.email( - { email, password }, - { - onSuccess: () => { - toast.success("Welcome back!"); - onSuccess(); - }, - onError: (ctx) => { - toast.error(ctx.error.message ?? "Something went wrong."); - setIsPending(false); - }, - }, - ); - }; - - return ( -
{ - e.preventDefault(); - void handleSubmit(); - }} - className="flex flex-col gap-3" - > - setEmail(e.target.value)} - required - className="w-full rounded-2xl border border-(--color-primary-light) bg-white px-4 py-3 text-sm text-(--color-text) placeholder:text-(--color-text-muted) focus:outline-none focus:ring-2 focus:ring-(--color-primary)" - /> - setPassword(e.target.value)} - required - className="w-full rounded-2xl border border-(--color-primary-light) bg-white px-4 py-3 text-sm text-(--color-text) placeholder:text-(--color-text-muted) focus:outline-none focus:ring-2 focus:ring-(--color-primary)" - /> - - -
- ); -}; - -type RegisterFormProps = { onSuccess: () => void }; - -const RegisterForm = ({ onSuccess }: RegisterFormProps) => { - const [name, setName] = useState(""); - const [email, setEmail] = useState(""); - const [password, setPassword] = useState(""); - const [isPending, setIsPending] = useState(false); - - const handleSubmit = async () => { - setIsPending(true); - await authClient.signUp.email( - { name, email, password }, - { - onSuccess: () => { - toast.success("Check your email to verify your account."); - onSuccess(); - }, - onError: (ctx) => { - toast.error(ctx.error.message ?? "Something went wrong."); - setIsPending(false); - }, - }, - ); - }; - - return ( -
{ - e.preventDefault(); - void handleSubmit(); - }} - className="flex flex-col gap-3" - > - setName(e.target.value)} - required - className="w-full rounded-2xl border border-(--color-primary-light) bg-white px-4 py-3 text-sm text-(--color-text) placeholder:text-(--color-text-muted) focus:outline-none focus:ring-2 focus:ring-(--color-primary)" - /> - setEmail(e.target.value)} - required - className="w-full rounded-2xl border border-(--color-primary-light) bg-white px-4 py-3 text-sm text-(--color-text) placeholder:text-(--color-text-muted) focus:outline-none focus:ring-2 focus:ring-(--color-primary)" - /> - setPassword(e.target.value)} - required - minLength={8} - className="w-full rounded-2xl border border-(--color-primary-light) bg-white px-4 py-3 text-sm text-(--color-text) placeholder:text-(--color-text-muted) focus:outline-none focus:ring-2 focus:ring-(--color-primary)" - /> - -
- ); -}; - -type SocialButtonsProps = { onSuccess: () => void }; - -const SocialButtons = ({ onSuccess }: SocialButtonsProps) => { - const handleSocial = (provider: "google" | "github") => { - void authClient.signIn.social( - { provider, callbackURL: window.location.origin }, - { - onSuccess, - onError: (ctx) => { - toast.error(ctx.error.message ?? "Something went wrong."); - }, - }, - ); - }; - - return ( -
-
-
- - or continue with - -
-
- - -
- ); -}; - -export const AuthModal = ({ onClose, onSuccess }: AuthModalProps) => { - const [tab, setTab] = useState("login"); - - useEffect(() => { - const handleKeyDown = (e: KeyboardEvent) => { - if (e.key === "Escape") onClose(); - }; - document.addEventListener("keydown", handleKeyDown); - return () => document.removeEventListener("keydown", handleKeyDown); - }, [onClose]); - - return ( -
-
e.stopPropagation()} - > - {/* Close button */} - - - {/* Header */} -
-

- lila -

-
- - {/* Tabs */} -
- {(["login", "register"] as Tab[]).map((t) => ( - - ))} -
- - {tab === "login" ? ( - - ) : ( - - )} - - {/* Social */} - -
-
- ); -}; diff --git a/apps/web/src/components/game/GameSetup.tsx b/apps/web/src/components/game/GameSetup.tsx index 269818c..9315bc4 100644 --- a/apps/web/src/components/game/GameSetup.tsx +++ b/apps/web/src/components/game/GameSetup.tsx @@ -10,9 +10,6 @@ import type { GameRequest } from "@lila/shared"; const LABELS: Record = { en: "English", it: "Italian", - de: "German", - fr: "French", - es: "Spanish", noun: "Nouns", verb: "Verbs", easy: "Easy", @@ -24,19 +21,19 @@ const LABELS: Record = { type GameSetupProps = { onStart: (settings: GameRequest) => void }; -type SettingGroupProps = { +type SettingGroupProps = { label: string; - options: readonly T[]; - selected: T; - onSelect: (value: T) => void; + options: readonly string[]; + selected: string; + onSelect: (value: string) => void; }; -const SettingGroup = ({ +const SettingGroup = ({ label, options, selected, onSelect, -}: SettingGroupProps) => ( +}: SettingGroupProps) => (

{label} @@ -52,7 +49,7 @@ const SettingGroup = ({ : "bg-white text-(--color-primary-dark) border-(--color-primary-light) hover:bg-(--color-surface) hover:-translate-y-0.5 active:translate-y-0" }`} > - {LABELS[String(option)] ?? option} + {LABELS[option] ?? option} ))}

@@ -68,7 +65,7 @@ export const GameSetup = ({ onStart }: GameSetupProps) => { ); const [pos, setPos] = useState(SUPPORTED_POS[0]); const [difficulty, setDifficulty] = useState(DIFFICULTY_LEVELS[0]); - const [rounds, setRounds] = useState(GAME_ROUNDS[0]); + const [rounds, setRounds] = useState(GAME_ROUNDS[0]); const handleSourceLanguage = (value: string) => { if (value === targetLanguage) { diff --git a/apps/web/src/components/game/QuestionCard.tsx b/apps/web/src/components/game/QuestionCard.tsx index 2d4c633..7878a5b 100644 --- a/apps/web/src/components/game/QuestionCard.tsx +++ b/apps/web/src/components/game/QuestionCard.tsx @@ -53,11 +53,7 @@ export const QuestionCard = ({ Round {questionNumber}/{totalQuestions}
- {currentResult - ? "Checked" - : selectedOptionId !== null - ? "Ready" - : "Pick one"} + {currentResult ? "Checked" : selectedOptionId !== null ? "Ready" : "Pick one"}
@@ -77,14 +73,14 @@ export const QuestionCard = ({
- {question.options.map((option) => ( - handleSelect(option.optionId)} - /> - ))} + {question.options.map((option) => ( + handleSelect(option.optionId)} + /> + ))}
diff --git a/apps/web/src/components/landing/Hero.tsx b/apps/web/src/components/landing/Hero.tsx index 238d313..6a6de87 100644 --- a/apps/web/src/components/landing/Hero.tsx +++ b/apps/web/src/components/landing/Hero.tsx @@ -7,8 +7,8 @@ const Hero = () => { return (
-
-
+
+
@@ -28,11 +28,9 @@ const Hero = () => {

- A word appears. You pick the translation. You score points. Then you - queue up a room and{" "} - - beat friends - {" "} + A word appears. You pick the translation. You score points. + Then you queue up a room and{" "} + beat friends{" "} in real time.

@@ -66,15 +64,13 @@ const Hero = () => { ) : ( <> Get started Log in diff --git a/apps/web/src/components/multiplayer/MultiplayerScoreScreen.tsx b/apps/web/src/components/multiplayer/MultiplayerScoreScreen.tsx index 8b82f1a..f530db8 100644 --- a/apps/web/src/components/multiplayer/MultiplayerScoreScreen.tsx +++ b/apps/web/src/components/multiplayer/MultiplayerScoreScreen.tsx @@ -69,9 +69,7 @@ export const MultiplayerScoreScreen = ({ {player.user.name} diff --git a/apps/web/src/components/navbar/NavAuth.tsx b/apps/web/src/components/navbar/NavAuth.tsx index f65f569..22b8479 100644 --- a/apps/web/src/components/navbar/NavAuth.tsx +++ b/apps/web/src/components/navbar/NavAuth.tsx @@ -24,14 +24,13 @@ const NavAuth = () => { ) : ( - Login + Sign in )}
diff --git a/apps/web/src/components/navbar/NavLogin.tsx b/apps/web/src/components/navbar/NavLogin.tsx new file mode 100644 index 0000000..f28bfdd --- /dev/null +++ b/apps/web/src/components/navbar/NavLogin.tsx @@ -0,0 +1,17 @@ +import { Link } from "@tanstack/react-router"; + +const NavLogin = () => { + return ( + + Login + + ); +}; + +export default NavLogin; diff --git a/apps/web/src/components/ui/ConfettiBurst.tsx b/apps/web/src/components/ui/ConfettiBurst.tsx index ee1fcfd..66285d4 100644 --- a/apps/web/src/components/ui/ConfettiBurst.tsx +++ b/apps/web/src/components/ui/ConfettiBurst.tsx @@ -6,7 +6,10 @@ type ConfettiBurstProps = { count?: number; }; -type Piece = { id: number; style: React.CSSProperties & ConfettiVars }; +type Piece = { + id: number; + style: React.CSSProperties & ConfettiVars; +}; type ConfettiVars = { ["--x0"]: string; @@ -53,9 +56,7 @@ export const ConfettiBurst = ({ }, []); const pieces = useMemo(() => { - const seed = hashStringToUint32( - `${instanceId}:${count}:${colors.join(",")}`, - ); + const seed = hashStringToUint32(`${instanceId}:${count}:${colors.join(",")}`); const rand = mulberry32(seed); const rnd = (min: number, max: number) => min + rand() * (max - min); @@ -99,3 +100,4 @@ export const ConfettiBurst = ({
); }; + diff --git a/apps/web/src/routeTree.gen.ts b/apps/web/src/routeTree.gen.ts index a85f2f2..96c3044 100644 --- a/apps/web/src/routeTree.gen.ts +++ b/apps/web/src/routeTree.gen.ts @@ -9,21 +9,15 @@ // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. import { Route as rootRouteImport } from './routes/__root' -import { Route as ResetPasswordRouteImport } from './routes/reset-password' import { Route as PlayRouteImport } from './routes/play' import { Route as MultiplayerRouteImport } from './routes/multiplayer' -import { Route as ForgotPasswordRouteImport } from './routes/forgot-password' +import { Route as LoginRouteImport } from './routes/login' import { Route as AboutRouteImport } from './routes/about' import { Route as IndexRouteImport } from './routes/index' import { Route as MultiplayerIndexRouteImport } from './routes/multiplayer/index' import { Route as MultiplayerLobbyCodeRouteImport } from './routes/multiplayer/lobby.$code' import { Route as MultiplayerGameCodeRouteImport } from './routes/multiplayer/game.$code' -const ResetPasswordRoute = ResetPasswordRouteImport.update({ - id: '/reset-password', - path: '/reset-password', - getParentRoute: () => rootRouteImport, -} as any) const PlayRoute = PlayRouteImport.update({ id: '/play', path: '/play', @@ -34,9 +28,9 @@ const MultiplayerRoute = MultiplayerRouteImport.update({ path: '/multiplayer', getParentRoute: () => rootRouteImport, } as any) -const ForgotPasswordRoute = ForgotPasswordRouteImport.update({ - id: '/forgot-password', - path: '/forgot-password', +const LoginRoute = LoginRouteImport.update({ + id: '/login', + path: '/login', getParentRoute: () => rootRouteImport, } as any) const AboutRoute = AboutRouteImport.update({ @@ -68,10 +62,9 @@ const MultiplayerGameCodeRoute = MultiplayerGameCodeRouteImport.update({ export interface FileRoutesByFullPath { '/': typeof IndexRoute '/about': typeof AboutRoute - '/forgot-password': typeof ForgotPasswordRoute + '/login': typeof LoginRoute '/multiplayer': typeof MultiplayerRouteWithChildren '/play': typeof PlayRoute - '/reset-password': typeof ResetPasswordRoute '/multiplayer/': typeof MultiplayerIndexRoute '/multiplayer/game/$code': typeof MultiplayerGameCodeRoute '/multiplayer/lobby/$code': typeof MultiplayerLobbyCodeRoute @@ -79,9 +72,8 @@ export interface FileRoutesByFullPath { export interface FileRoutesByTo { '/': typeof IndexRoute '/about': typeof AboutRoute - '/forgot-password': typeof ForgotPasswordRoute + '/login': typeof LoginRoute '/play': typeof PlayRoute - '/reset-password': typeof ResetPasswordRoute '/multiplayer': typeof MultiplayerIndexRoute '/multiplayer/game/$code': typeof MultiplayerGameCodeRoute '/multiplayer/lobby/$code': typeof MultiplayerLobbyCodeRoute @@ -90,10 +82,9 @@ export interface FileRoutesById { __root__: typeof rootRouteImport '/': typeof IndexRoute '/about': typeof AboutRoute - '/forgot-password': typeof ForgotPasswordRoute + '/login': typeof LoginRoute '/multiplayer': typeof MultiplayerRouteWithChildren '/play': typeof PlayRoute - '/reset-password': typeof ResetPasswordRoute '/multiplayer/': typeof MultiplayerIndexRoute '/multiplayer/game/$code': typeof MultiplayerGameCodeRoute '/multiplayer/lobby/$code': typeof MultiplayerLobbyCodeRoute @@ -103,10 +94,9 @@ export interface FileRouteTypes { fullPaths: | '/' | '/about' - | '/forgot-password' + | '/login' | '/multiplayer' | '/play' - | '/reset-password' | '/multiplayer/' | '/multiplayer/game/$code' | '/multiplayer/lobby/$code' @@ -114,9 +104,8 @@ export interface FileRouteTypes { to: | '/' | '/about' - | '/forgot-password' + | '/login' | '/play' - | '/reset-password' | '/multiplayer' | '/multiplayer/game/$code' | '/multiplayer/lobby/$code' @@ -124,10 +113,9 @@ export interface FileRouteTypes { | '__root__' | '/' | '/about' - | '/forgot-password' + | '/login' | '/multiplayer' | '/play' - | '/reset-password' | '/multiplayer/' | '/multiplayer/game/$code' | '/multiplayer/lobby/$code' @@ -136,21 +124,13 @@ export interface FileRouteTypes { export interface RootRouteChildren { IndexRoute: typeof IndexRoute AboutRoute: typeof AboutRoute - ForgotPasswordRoute: typeof ForgotPasswordRoute + LoginRoute: typeof LoginRoute MultiplayerRoute: typeof MultiplayerRouteWithChildren PlayRoute: typeof PlayRoute - ResetPasswordRoute: typeof ResetPasswordRoute } declare module '@tanstack/react-router' { interface FileRoutesByPath { - '/reset-password': { - id: '/reset-password' - path: '/reset-password' - fullPath: '/reset-password' - preLoaderRoute: typeof ResetPasswordRouteImport - parentRoute: typeof rootRouteImport - } '/play': { id: '/play' path: '/play' @@ -165,11 +145,11 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof MultiplayerRouteImport parentRoute: typeof rootRouteImport } - '/forgot-password': { - id: '/forgot-password' - path: '/forgot-password' - fullPath: '/forgot-password' - preLoaderRoute: typeof ForgotPasswordRouteImport + '/login': { + id: '/login' + path: '/login' + fullPath: '/login' + preLoaderRoute: typeof LoginRouteImport parentRoute: typeof rootRouteImport } '/about': { @@ -229,10 +209,9 @@ const MultiplayerRouteWithChildren = MultiplayerRoute._addFileChildren( const rootRouteChildren: RootRouteChildren = { IndexRoute: IndexRoute, AboutRoute: AboutRoute, - ForgotPasswordRoute: ForgotPasswordRoute, + LoginRoute: LoginRoute, MultiplayerRoute: MultiplayerRouteWithChildren, PlayRoute: PlayRoute, - ResetPasswordRoute: ResetPasswordRoute, } export const routeTree = rootRouteImport ._addFileChildren(rootRouteChildren) diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx index 7df9998..1dc4378 100644 --- a/apps/web/src/routes/__root.tsx +++ b/apps/web/src/routes/__root.tsx @@ -1,47 +1,17 @@ -import { - createRootRoute, - Outlet, - useNavigate, - useSearch, -} from "@tanstack/react-router"; +import { createRootRoute, Outlet } from "@tanstack/react-router"; import { TanStackRouterDevtools } from "@tanstack/react-router-devtools"; -import { Toaster } from "sonner"; import Navbar from "../components/navbar/NavBar"; -import NotFound from "../components/NotFound"; -import RootError from "../components/RootError"; -import { AuthModal } from "../components/auth/AuthModal"; -import { AuthModalSearchSchema } from "@lila/shared"; const RootLayout = () => { - const navigate = useNavigate(); - const { modal, redirect } = useSearch({ from: "__root__" }); - - const handleClose = () => { - void navigate({ to: "/", search: {} }); - }; - - const handleSuccess = () => { - void navigate({ to: (redirect as string) ?? "/", search: {} }); - }; - return ( <>
- {modal === "auth" && ( - - )} - ); }; -export const Route = createRootRoute({ - component: RootLayout, - notFoundComponent: NotFound, - errorComponent: RootError, - validateSearch: AuthModalSearchSchema, -}); +export const Route = createRootRoute({ component: RootLayout }); diff --git a/apps/web/src/routes/forgot-password.tsx b/apps/web/src/routes/forgot-password.tsx deleted file mode 100644 index 9d929a8..0000000 --- a/apps/web/src/routes/forgot-password.tsx +++ /dev/null @@ -1,74 +0,0 @@ -import { useState } from "react"; -import { createFileRoute, Link } from "@tanstack/react-router"; -import { authClient } from "../lib/auth-client"; -import { toast } from "sonner"; - -function ForgotPasswordPage() { - const [email, setEmail] = useState(""); - const [isPending, setIsPending] = useState(false); - - const handleSubmit = async () => { - setIsPending(true); - await authClient.requestPasswordReset( - { email, redirectTo: `${window.location.origin}/reset-password` }, - { - onSuccess: () => { - toast.success("Check your email for a reset link."); - setIsPending(false); - }, - onError: (ctx) => { - toast.error(ctx.error.message ?? "Something went wrong."); - setIsPending(false); - }, - }, - ); - }; - - return ( -
-
-

- Forgot password -

-

- Enter your email and we'll send you a reset link. -

-
- -
{ - e.preventDefault(); - void handleSubmit(); - }} - className="w-full flex flex-col gap-3" - > - setEmail(e.target.value)} - required - className="w-full rounded-2xl border border-(--color-primary-light) bg-white px-4 py-3 text-sm text-(--color-text) placeholder:text-(--color-text-muted) focus:outline-none focus:ring-2 focus:ring-(--color-primary)" - /> - -
- - - Back to home - -
- ); -} - -export const Route = createFileRoute("/forgot-password")({ - component: ForgotPasswordPage, -}); diff --git a/apps/web/src/routes/login.tsx b/apps/web/src/routes/login.tsx new file mode 100644 index 0000000..8451d41 --- /dev/null +++ b/apps/web/src/routes/login.tsx @@ -0,0 +1,46 @@ +import { createFileRoute, useNavigate } from "@tanstack/react-router"; +import { signIn, useSession } from "../lib/auth-client"; + +const LoginPage = () => { + const { data: session, isPending } = useSession(); + const navigate = useNavigate(); + + if (isPending) return
Loading...
; + + if (session) { + void navigate({ to: "/" }); + return null; + } + + return ( +
+

sign in to lila

+ + +
+ ); +}; + +export const Route = createFileRoute("/login")({ component: LoginPage }); diff --git a/apps/web/src/routes/multiplayer.tsx b/apps/web/src/routes/multiplayer.tsx index 0008b37..7adffd6 100644 --- a/apps/web/src/routes/multiplayer.tsx +++ b/apps/web/src/routes/multiplayer.tsx @@ -14,10 +14,7 @@ export const Route = createFileRoute("/multiplayer")({ beforeLoad: async () => { const { data: session } = await authClient.getSession(); if (!session) { - throw redirect({ - to: "/", - search: { modal: "auth", redirect: "/multiplayer" }, - }); + throw redirect({ to: "/login" }); } return { session }; }, diff --git a/apps/web/src/routes/multiplayer/index.tsx b/apps/web/src/routes/multiplayer/index.tsx index 2780eab..ee757f4 100644 --- a/apps/web/src/routes/multiplayer/index.tsx +++ b/apps/web/src/routes/multiplayer/index.tsx @@ -108,9 +108,7 @@ function MultiplayerPage() { {/* Join lobby */}
-

- Join a lobby -

+

Join a lobby

Enter the code shared by your host.

diff --git a/apps/web/src/routes/play.tsx b/apps/web/src/routes/play.tsx index bc4cde3..32db5c4 100644 --- a/apps/web/src/routes/play.tsx +++ b/apps/web/src/routes/play.tsx @@ -4,7 +4,6 @@ import type { GameSession, GameRequest, AnswerResult } from "@lila/shared"; import { QuestionCard } from "../components/game/QuestionCard"; import { ScoreScreen } from "../components/game/ScoreScreen"; import { GameSetup } from "../components/game/GameSetup"; -import RouteError from "../components/RouteError"; import { authClient } from "../lib/auth-client"; type GameStartResponse = { success: true; data: GameSession }; @@ -128,11 +127,10 @@ function Play() { export const Route = createFileRoute("/play")({ component: Play, - errorComponent: RouteError, beforeLoad: async () => { const { data: session } = await authClient.getSession(); if (!session) { - throw redirect({ to: "/", search: { modal: "auth", redirect: "/play" } }); + throw redirect({ to: "/login" }); } }, }); diff --git a/apps/web/src/routes/reset-password.tsx b/apps/web/src/routes/reset-password.tsx deleted file mode 100644 index 837949b..0000000 --- a/apps/web/src/routes/reset-password.tsx +++ /dev/null @@ -1,91 +0,0 @@ -import { useState } from "react"; -import { createFileRoute, Link, useNavigate } from "@tanstack/react-router"; -import { authClient } from "../lib/auth-client"; -import { toast } from "sonner"; -import { ResetPasswordSearchSchema } from "@lila/shared"; - -function ResetPasswordPage() { - const { token } = Route.useSearch(); - const navigate = useNavigate(); - const [password, setPassword] = useState(""); - const [isPending, setIsPending] = useState(false); - - if (!token) { - return ( -
-

- Invalid link -

-

- This reset link is invalid or has expired. -

- - Request a new one - -
- ); - } - - const handleSubmit = async () => { - setIsPending(true); - await authClient.resetPassword( - { newPassword: password, token }, - { - onSuccess: () => { - toast.success("Password updated. You can now sign in."); - void navigate({ to: "/" }); - }, - onError: (ctx) => { - toast.error(ctx.error.message ?? "Something went wrong."); - setIsPending(false); - }, - }, - ); - }; - - return ( -
-
-

- Reset password -

-

- Enter your new password below. -

-
- -
{ - e.preventDefault(); - void handleSubmit(); - }} - className="w-full flex flex-col gap-3" - > - setPassword(e.target.value)} - required - minLength={8} - className="w-full rounded-2xl border border-(--color-primary-light) bg-white px-4 py-3 text-sm text-(--color-text) placeholder:text-(--color-text-muted) focus:outline-none focus:ring-2 focus:ring-(--color-primary)" - /> - -
-
- ); -} - -export const Route = createFileRoute("/reset-password")({ - component: ResetPasswordPage, - validateSearch: ResetPasswordSearchSchema, -}); diff --git a/data-pipeline/test/output/sample.json b/data-pipeline/test/output/sample.json index 3177e22..5dd774f 100644 --- a/data-pipeline/test/output/sample.json +++ b/data-pipeline/test/output/sample.json @@ -3,8 +3,12 @@ "source_id": "ili:i90862", "pos": "noun", "translations": { - "en": ["kinsman"], - "es": ["pariente"], + "en": [ + "kinsman" + ], + "es": [ + "pariente" + ], "de": [ "Gevatter", "Anverwandter", @@ -14,11 +18,17 @@ "Angehöriger", "Verwandte" ], - "fr": ["parent"] + "fr": [ + "parent" + ] }, "glosses": { - "en": ["a male relative"], - "de": ["ein männlicher Verwandter"] + "en": [ + "a male relative" + ], + "de": [ + "ein männlicher Verwandter" + ] }, "examples": { "de": [ @@ -34,10 +44,16 @@ "text": "Alle Familienangehörigen kamen zum Treffen.", "source": "cefr" }, - { "text": "Er ist ein Angehöriger der Familie.", "source": "cefr" } + { + "text": "Er ist ein Angehöriger der Familie.", + "source": "cefr" + } ], "fr": [ - { "text": "Ses parents sont très fiers de lui.", "source": "cefr" } + { + "text": "Ses parents sont très fiers de lui.", + "source": "cefr" + } ], "es": [ { @@ -47,15 +63,35 @@ ] }, "votes": { - "en": { "kinsman": { "cefr_source": "C1" } }, - "de": { - "Familienmitglied": { "cefr_source": "A2" }, - "Verwandter": { "cefr_source": "B1" }, - "Familienangehöriger": { "cefr_source": "B1" }, - "Angehöriger": { "cefr_source": "B2" } + "en": { + "kinsman": { + "cefr_source": "C1" + } }, - "fr": { "parent": { "cefr_source": "A1" } }, - "es": { "pariente": { "cefr_source": "A2" } } + "de": { + "Familienmitglied": { + "cefr_source": "A2" + }, + "Verwandter": { + "cefr_source": "B1" + }, + "Familienangehöriger": { + "cefr_source": "B1" + }, + "Angehöriger": { + "cefr_source": "B2" + } + }, + "fr": { + "parent": { + "cefr_source": "A1" + } + }, + "es": { + "pariente": { + "cefr_source": "A2" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -63,41 +99,96 @@ "source_id": "ili:i23087", "pos": "verb", "translations": { - "en": ["teach"], - "it": ["addestrare", "ammaestrare", "insegnare"], - "es": ["enseñar"], - "fr": ["enseigner", "apprendre", "guider"] - }, - "glosses": { "en": ["accustom gradually to some action or attitude"] }, - "examples": { "en": [ - { "text": "The child is taught to obey her parents", "source": "omw" } + "teach" ], "it": [ - { "text": "Stiamo addestrando il nostro cane.", "source": "cefr" }, - { "text": "Lei insegna italiano ai bambini.", "source": "cefr" } - ], - "fr": [ - { "text": "Elle enseigne le français au lycée.", "source": "cefr" }, - { "text": "J'apprends le français.", "source": "cefr" }, - { "text": "Il va nous guider à travers la forêt.", "source": "cefr" } + "addestrare", + "ammaestrare", + "insegnare" ], "es": [ - { "text": "Ella enseña español en la universidad.", "source": "cefr" } + "enseñar" + ], + "fr": [ + "enseigner", + "apprendre", + "guider" + ] + }, + "glosses": { + "en": [ + "accustom gradually to some action or attitude" + ] + }, + "examples": { + "en": [ + { + "text": "The child is taught to obey her parents", + "source": "omw" + } + ], + "it": [ + { + "text": "Stiamo addestrando il nostro cane.", + "source": "cefr" + }, + { + "text": "Lei insegna italiano ai bambini.", + "source": "cefr" + } + ], + "fr": [ + { + "text": "Elle enseigne le français au lycée.", + "source": "cefr" + }, + { + "text": "J'apprends le français.", + "source": "cefr" + }, + { + "text": "Il va nous guider à travers la forêt.", + "source": "cefr" + } + ], + "es": [ + { + "text": "Ella enseña español en la universidad.", + "source": "cefr" + } ] }, "votes": { - "en": { "teach": { "cefr_source": "A1" } }, + "en": { + "teach": { + "cefr_source": "A1" + } + }, "it": { - "addestrare": { "cefr_source": "B1" }, - "insegnare": { "cefr_source": "A1" } + "addestrare": { + "cefr_source": "B1" + }, + "insegnare": { + "cefr_source": "A1" + } }, "fr": { - "enseigner": { "cefr_source": "A2" }, - "apprendre": { "cefr_source": "A1" }, - "guider": { "cefr_source": "A2" } + "enseigner": { + "cefr_source": "A2" + }, + "apprendre": { + "cefr_source": "A1" + }, + "guider": { + "cefr_source": "A2" + } }, - "es": { "enseñar": { "cefr_source": "A1" } } + "es": { + "enseñar": { + "cefr_source": "A1" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -105,19 +196,39 @@ "source_id": "ili:i26718", "pos": "verb", "translations": { - "en": ["dub", "nickname"], - "it": ["battezzare", "cognominare", "doppiare", "soprannominare"], - "es": ["apodar"], - "fr": ["surnom", "baptiser"] + "en": [ + "dub", + "nickname" + ], + "it": [ + "battezzare", + "cognominare", + "doppiare", + "soprannominare" + ], + "es": [ + "apodar" + ], + "fr": [ + "surnom", + "baptiser" + ] + }, + "glosses": { + "en": [ + "give a nickname to" + ] }, - "glosses": { "en": ["give a nickname to"] }, "examples": { "it": [ { "text": "Hanno deciso di battezzare il loro figlio la prossima primavera.", "source": "cefr" }, - { "text": "Lo hanno soprannominato 'il Professore'.", "source": "cefr" } + { + "text": "Lo hanno soprannominato 'il Professore'.", + "source": "cefr" + } ], "fr": [ { @@ -127,12 +238,24 @@ ] }, "votes": { - "en": { "dub": { "cefr_source": "B2" } }, - "it": { - "battezzare": { "cefr_source": "B1" }, - "soprannominare": { "cefr_source": "B2" } + "en": { + "dub": { + "cefr_source": "B2" + } }, - "fr": { "baptiser": { "cefr_source": "B1" } } + "it": { + "battezzare": { + "cefr_source": "B1" + }, + "soprannominare": { + "cefr_source": "B2" + } + }, + "fr": { + "baptiser": { + "cefr_source": "B1" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -140,46 +263,92 @@ "source_id": "ili:i4448", "pos": "adjective", "translations": { - "en": ["drab", "dreary"], - "es": ["igual", "rutinario"], - "fr": ["morne", "maussade", "sombre"] + "en": [ + "drab", + "dreary" + ], + "es": [ + "igual", + "rutinario" + ], + "fr": [ + "morne", + "maussade", + "sombre" + ] + }, + "glosses": { + "en": [ + "lacking in liveliness or charm or surprise" + ] }, - "glosses": { "en": ["lacking in liveliness or charm or surprise"] }, "examples": { "en": [ - { "text": "her drab personality", "source": "omw" }, + { + "text": "her drab personality", + "source": "omw" + }, { "text": "life was drab compared with the more exciting life style overseas", "source": "omw" }, - { "text": "a series of dreary dinner parties", "source": "omw" } + { + "text": "a series of dreary dinner parties", + "source": "omw" + } ], "fr": [ - { "text": "Le temps était morne et pluvieux.", "source": "cefr" }, + { + "text": "Le temps était morne et pluvieux.", + "source": "cefr" + }, { "text": "Le temps était maussade toute la journée.", "source": "cefr" }, - { "text": "La pièce était sombre sans lumière.", "source": "cefr" } + { + "text": "La pièce était sombre sans lumière.", + "source": "cefr" + } ], "es": [ - { "text": "Todos somos iguales.", "source": "cefr" }, - { "text": "Su trabajo se ha vuelto muy rutinario.", "source": "cefr" } + { + "text": "Todos somos iguales.", + "source": "cefr" + }, + { + "text": "Su trabajo se ha vuelto muy rutinario.", + "source": "cefr" + } ] }, "votes": { "en": { - "drab": { "cefr_source": "B2" }, - "dreary": { "cefr_source": "B2" } + "drab": { + "cefr_source": "B2" + }, + "dreary": { + "cefr_source": "B2" + } }, "fr": { - "morne": { "cefr_source": "B2" }, - "maussade": { "cefr_source": "B2" }, - "sombre": { "cefr_source": "B1" } + "morne": { + "cefr_source": "B2" + }, + "maussade": { + "cefr_source": "B2" + }, + "sombre": { + "cefr_source": "B1" + } }, "es": { - "igual": { "cefr_source": "A2" }, - "rutinario": { "cefr_source": "B1" } + "igual": { + "cefr_source": "A2" + }, + "rutinario": { + "cefr_source": "B1" + } } }, "_sample_bucket": "has_cefr_vote" @@ -188,30 +357,75 @@ "source_id": "ili:i85845", "pos": "noun", "translations": { - "en": ["natural depression", "depression"], - "it": ["avvallamento"], - "es": ["depresión", "depresión natural"], - "fr": ["dépression"] - }, - "glosses": { "en": ["a sunken or depressed geological formation"] }, - "examples": { - "fr": [{ "text": "Elle souffre de dépression.", "source": "cefr" }], + "en": [ + "natural depression", + "depression" + ], + "it": [ + "avvallamento" + ], "es": [ - { "text": "La depresión es una enfermedad grave.", "source": "cefr" } + "depresión", + "depresión natural" + ], + "fr": [ + "dépression" + ] + }, + "glosses": { + "en": [ + "a sunken or depressed geological formation" + ] + }, + "examples": { + "fr": [ + { + "text": "Elle souffre de dépression.", + "source": "cefr" + } + ], + "es": [ + { + "text": "La depresión es una enfermedad grave.", + "source": "cefr" + } ] }, "votes": { - "en": { "depression": { "cefr_source": "B2" } }, - "fr": { "dépression": { "cefr_source": "B2" } }, - "es": { "depresión": { "cefr_source": "B1" } } + "en": { + "depression": { + "cefr_source": "B2" + } + }, + "fr": { + "dépression": { + "cefr_source": "B2" + } + }, + "es": { + "depresión": { + "cefr_source": "B1" + } + } }, "_sample_bucket": "has_cefr_vote" }, { "source_id": "ili:i27202", "pos": "verb", - "translations": { "en": ["jump"], "fr": ["sauter"] }, - "glosses": { "en": ["make a sudden physical attack on"] }, + "translations": { + "en": [ + "jump" + ], + "fr": [ + "sauter" + ] + }, + "glosses": { + "en": [ + "make a sudden physical attack on" + ] + }, "examples": { "en": [ { @@ -227,8 +441,16 @@ ] }, "votes": { - "en": { "jump": { "cefr_source": "A1" } }, - "fr": { "sauter": { "cefr_source": "A2" } } + "en": { + "jump": { + "cefr_source": "A1" + } + }, + "fr": { + "sauter": { + "cefr_source": "A2" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -243,8 +465,15 @@ "butt against", "knock against" ], - "it": ["urtare"], - "es": ["chocar", "colisionar", "golpearse contra", "topar"], + "it": [ + "urtare" + ], + "es": [ + "chocar", + "colisionar", + "golpearse contra", + "topar" + ], "de": [ "anraunzen", "anfahren", @@ -259,32 +488,68 @@ ] }, "glosses": { - "en": ["collide violently with an obstacle"], - "de": ["heftig mit einem Hindernis zusammenstoßen"] - }, - "examples": { - "en": [{ "text": "I ran into the telephone pole", "source": "omw" }], - "it": [ - { "text": "Ho urtato il tavolo con il gomito.", "source": "cefr" } + "en": [ + "collide violently with an obstacle" ], "de": [ - { "text": "Der Bus fuhr an die Haltestelle an.", "source": "cefr" }, - { "text": "Er hat mich ohne Grund angeschrien.", "source": "cefr" } + "heftig mit einem Hindernis zusammenstoßen" + ] + }, + "examples": { + "en": [ + { + "text": "I ran into the telephone pole", + "source": "omw" + } + ], + "it": [ + { + "text": "Ho urtato il tavolo con il gomito.", + "source": "cefr" + } + ], + "de": [ + { + "text": "Der Bus fuhr an die Haltestelle an.", + "source": "cefr" + }, + { + "text": "Er hat mich ohne Grund angeschrien.", + "source": "cefr" + } ], "es": [ - { "text": "El coche chocó contra un árbol.", "source": "cefr" }, - { "text": "Me topé con un viejo amigo en la calle.", "source": "cefr" } + { + "text": "El coche chocó contra un árbol.", + "source": "cefr" + }, + { + "text": "Me topé con un viejo amigo en la calle.", + "source": "cefr" + } ] }, "votes": { - "it": { "urtare": { "cefr_source": "B1" } }, + "it": { + "urtare": { + "cefr_source": "B1" + } + }, "de": { - "anfahren": { "cefr_source": "B1" }, - "anschreien": { "cefr_source": "B1" } + "anfahren": { + "cefr_source": "B1" + }, + "anschreien": { + "cefr_source": "B1" + } }, "es": { - "chocar": { "cefr_source": "A2" }, - "topar": { "cefr_source": "B1" } + "chocar": { + "cefr_source": "A2" + }, + "topar": { + "cefr_source": "B1" + } } }, "_sample_bucket": "has_cefr_vote" @@ -292,19 +557,42 @@ { "source_id": "ili:i27676", "pos": "verb", - "translations": { "en": ["fumble"] }, - "glosses": { "en": ["handle clumsily"] }, + "translations": { + "en": [ + "fumble" + ] + }, + "glosses": { + "en": [ + "handle clumsily" + ] + }, "examples": {}, - "votes": { "en": { "fumble": { "cefr_source": "B2" } } }, + "votes": { + "en": { + "fumble": { + "cefr_source": "B2" + } + } + }, "_sample_bucket": "has_cefr_vote" }, { "source_id": "ili:i30768", "pos": "verb", "translations": { - "en": ["attract", "appeal"], - "it": ["allettare", "attirare", "attrarre"], - "es": ["atraer"], + "en": [ + "attract", + "appeal" + ], + "it": [ + "allettare", + "attirare", + "attrarre" + ], + "es": [ + "atraer" + ], "de": [ "anziehen", "etwas überziehen", @@ -316,51 +604,98 @@ "ankleiden", "Kleidung anlegen" ], - "fr": ["allécher", "attirer"] + "fr": [ + "allécher", + "attirer" + ] }, "glosses": { - "en": ["be attractive to"], + "en": [ + "be attractive to" + ], "de": [ "ein Kleidungsstück in der dafür vorgesehenen Weise auf den Körper bringen" ] }, "examples": { "en": [ - { "text": "The idea of a vacation appeals to me", "source": "omw" }, + { + "text": "The idea of a vacation appeals to me", + "source": "omw" + }, { "text": "The beautiful garden attracted many people", "source": "omw" } ], - "de": [{ "text": "Sie zog sich das Kleid an.", "source": "omw" }], + "de": [ + { + "text": "Sie zog sich das Kleid an.", + "source": "omw" + } + ], "it": [ - { "text": "Il nuovo negozio attira molti clienti.", "source": "cefr" }, - { "text": "Il magnete attrae il metallo.", "source": "cefr" } + { + "text": "Il nuovo negozio attira molti clienti.", + "source": "cefr" + }, + { + "text": "Il magnete attrae il metallo.", + "source": "cefr" + } ], "fr": [ { "text": "La promesse d'un salaire élevé a alléché de nombreux candidats.", "source": "cefr" }, - { "text": "Cette publicité attire l'attention.", "source": "cefr" } + { + "text": "Cette publicité attire l'attention.", + "source": "cefr" + } ], - "es": [{ "text": "El imán atrae el metal.", "source": "cefr" }] + "es": [ + { + "text": "El imán atrae el metal.", + "source": "cefr" + } + ] }, "votes": { - "en": { "attract": { "cefr_source": "B1" } }, + "en": { + "attract": { + "cefr_source": "B1" + } + }, "it": { - "attirare": { "cefr_source": "B2" }, - "attrarre": { "cefr_source": "B1" } + "attirare": { + "cefr_source": "B2" + }, + "attrarre": { + "cefr_source": "B1" + } }, "de": { - "anziehen": { "cefr_source": "A2" }, - "bekleiden": { "cefr_source": "B2" } + "anziehen": { + "cefr_source": "A2" + }, + "bekleiden": { + "cefr_source": "B2" + } }, "fr": { - "allécher": { "cefr_source": "C1" }, - "attirer": { "cefr_source": "B1" } + "allécher": { + "cefr_source": "C1" + }, + "attirer": { + "cefr_source": "B1" + } }, - "es": { "atraer": { "cefr_source": "B2" } } + "es": { + "atraer": { + "cefr_source": "B2" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -368,11 +703,23 @@ "source_id": "ili:i112909", "pos": "noun", "translations": { - "en": ["regulation"], - "es": ["reglamento"], - "fr": ["réglementation", "gouvernement", "tenue"] + "en": [ + "regulation" + ], + "es": [ + "reglamento" + ], + "fr": [ + "réglementation", + "gouvernement", + "tenue" + ] + }, + "glosses": { + "en": [ + "the state of being controlled or governed" + ] }, - "glosses": { "en": ["the state of being controlled or governed"] }, "examples": { "fr": [ { @@ -388,16 +735,35 @@ "source": "cefr" } ], - "es": [{ "text": "Debemos seguir el reglamento.", "source": "cefr" }] + "es": [ + { + "text": "Debemos seguir el reglamento.", + "source": "cefr" + } + ] }, "votes": { - "en": { "regulation": { "cefr_source": "B2" } }, - "fr": { - "réglementation": { "cefr_source": "B2" }, - "gouvernement": { "cefr_source": "B1" }, - "tenue": { "cefr_source": "B1" } + "en": { + "regulation": { + "cefr_source": "B2" + } }, - "es": { "reglamento": { "cefr_source": "B2" } } + "fr": { + "réglementation": { + "cefr_source": "B2" + }, + "gouvernement": { + "cefr_source": "B1" + }, + "tenue": { + "cefr_source": "B1" + } + }, + "es": { + "reglamento": { + "cefr_source": "B2" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -412,8 +778,12 @@ "ladybird", "ladybird beetle" ], - "it": ["coccinella"], - "fr": ["coccinelle"] + "it": [ + "coccinella" + ], + "fr": [ + "coccinelle" + ] }, "glosses": { "en": [ @@ -422,12 +792,23 @@ }, "examples": { "fr": [ - { "text": "Une coccinelle s'est posée sur ma main.", "source": "cefr" } + { + "text": "Une coccinelle s'est posée sur ma main.", + "source": "cefr" + } ] }, "votes": { - "en": { "ladybug": { "cefr_source": "A2" } }, - "fr": { "coccinelle": { "cefr_source": "A2" } } + "en": { + "ladybug": { + "cefr_source": "A2" + } + }, + "fr": { + "coccinelle": { + "cefr_source": "A2" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -435,32 +816,56 @@ "source_id": "ili:i15517", "pos": "adjective", "translations": { - "en": ["judicial"], - "it": ["giudiziale", "giudiziario"], - "es": ["judicial"], + "en": [ + "judicial" + ], + "it": [ + "giudiziale", + "giudiziario" + ], + "es": [ + "judicial" + ], "de": [ "durch einen Richter", "durch ein Gericht", "durch den Richter", "richterlich" ], - "fr": ["judiciaire"] + "fr": [ + "judiciaire" + ] }, "glosses": { - "en": ["belonging or appropriate to the office of a judge"], - "de": ["zum Amt eines Richters gehörend oder diesem zugehörig"] + "en": [ + "belonging or appropriate to the office of a judge" + ], + "de": [ + "zum Amt eines Richters gehörend oder diesem zugehörig" + ] }, "examples": { - "en": [{ "text": "judicial robes", "source": "omw" }], + "en": [ + { + "text": "judicial robes", + "source": "omw" + } + ], "it": [ - { "text": "Hanno avviato un'azione giudiziale.", "source": "cefr" }, + { + "text": "Hanno avviato un'azione giudiziale.", + "source": "cefr" + }, { "text": "Il sistema giudiziario italiano è complesso.", "source": "cefr" } ], "de": [ - { "text": "Es bedarf einer richterlichen Anordnung.", "source": "cefr" } + { + "text": "Es bedarf einer richterlichen Anordnung.", + "source": "cefr" + } ], "fr": [ { @@ -468,37 +873,104 @@ "source": "cefr" } ], - "es": [{ "text": "El proceso judicial fue largo.", "source": "cefr" }] + "es": [ + { + "text": "El proceso judicial fue largo.", + "source": "cefr" + } + ] }, "votes": { - "en": { "judicial": { "cefr_source": "C1" } }, - "it": { - "giudiziale": { "cefr_source": "C1" }, - "giudiziario": { "cefr_source": "C1" } + "en": { + "judicial": { + "cefr_source": "C1" + } }, - "de": { "richterlich": { "cefr_source": "C1" } }, - "fr": { "judiciaire": { "cefr_source": "B2" } }, - "es": { "judicial": { "cefr_source": "C1" } } + "it": { + "giudiziale": { + "cefr_source": "C1" + }, + "giudiziario": { + "cefr_source": "C1" + } + }, + "de": { + "richterlich": { + "cefr_source": "C1" + } + }, + "fr": { + "judiciaire": { + "cefr_source": "B2" + } + }, + "es": { + "judicial": { + "cefr_source": "C1" + } + } }, "_sample_bucket": "has_cefr_vote" }, { "source_id": "ili:i11095", "pos": "adjective", - "translations": { "en": ["poor"], "es": ["pobre"], "fr": ["pauvre"] }, - "glosses": { "en": ["characterized by or indicating poverty"] }, + "translations": { + "en": [ + "poor" + ], + "es": [ + "pobre" + ], + "fr": [ + "pauvre" + ] + }, + "glosses": { + "en": [ + "characterized by or indicating poverty" + ] + }, "examples": { "en": [ - { "text": "the country had a poor economy", "source": "omw" }, - { "text": "they lived in the poor section of town", "source": "omw" } + { + "text": "the country had a poor economy", + "source": "omw" + }, + { + "text": "they lived in the poor section of town", + "source": "omw" + } ], - "fr": [{ "text": "Il est très pauvre.", "source": "cefr" }], - "es": [{ "text": "Es un hombre muy pobre.", "source": "cefr" }] + "fr": [ + { + "text": "Il est très pauvre.", + "source": "cefr" + } + ], + "es": [ + { + "text": "Es un hombre muy pobre.", + "source": "cefr" + } + ] }, "votes": { - "en": { "poor": { "cefr_source": "A2" } }, - "fr": { "pauvre": { "cefr_source": "A1" } }, - "es": { "pobre": { "cefr_source": "A1" } } + "en": { + "poor": { + "cefr_source": "A2" + } + }, + "fr": { + "pauvre": { + "cefr_source": "A1" + } + }, + "es": { + "pobre": { + "cefr_source": "A1" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -516,7 +988,10 @@ "tawdriness", "glitz" ], - "it": ["pacchianeria", "vistosità"], + "it": [ + "pacchianeria", + "vistosità" + ], "es": [ "astracanada", "chabacanería", @@ -526,12 +1001,22 @@ "ordinariez", "zafiedad" ], - "de": ["Aufdringlichkeit", "Zudringlichkeit", "Penetranz"], - "fr": ["culot"] + "de": [ + "Aufdringlichkeit", + "Zudringlichkeit", + "Penetranz" + ], + "fr": [ + "culot" + ] }, "glosses": { - "en": ["tasteless showiness"], - "de": ["geschmacklose Aufdringlichkeit"] + "en": [ + "tasteless showiness" + ], + "de": [ + "geschmacklose Aufdringlichkeit" + ] }, "examples": { "fr": [ @@ -543,10 +1028,18 @@ }, "votes": { "en": { - "loudness": { "cefr_source": "B2" }, - "glitz": { "cefr_source": "B2" } + "loudness": { + "cefr_source": "B2" + }, + "glitz": { + "cefr_source": "B2" + } }, - "fr": { "culot": { "cefr_source": "B2" } } + "fr": { + "culot": { + "cefr_source": "B2" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -554,19 +1047,52 @@ "source_id": "ili:i22613", "pos": "verb", "translations": { - "en": ["scavenge", "clean"], - "es": ["limpiar"], - "fr": ["nettoyer"] + "en": [ + "scavenge", + "clean" + ], + "es": [ + "limpiar" + ], + "fr": [ + "nettoyer" + ] + }, + "glosses": { + "en": [ + "remove unwanted substances from" + ] }, - "glosses": { "en": ["remove unwanted substances from"] }, "examples": { - "fr": [{ "text": "Je dois nettoyer ma chambre.", "source": "cefr" }], - "es": [{ "text": "Necesito limpiar mi habitación.", "source": "cefr" }] + "fr": [ + { + "text": "Je dois nettoyer ma chambre.", + "source": "cefr" + } + ], + "es": [ + { + "text": "Necesito limpiar mi habitación.", + "source": "cefr" + } + ] }, "votes": { - "en": { "scavenge": { "cefr_source": "B2" } }, - "fr": { "nettoyer": { "cefr_source": "A1" } }, - "es": { "limpiar": { "cefr_source": "A1" } } + "en": { + "scavenge": { + "cefr_source": "B2" + } + }, + "fr": { + "nettoyer": { + "cefr_source": "A1" + } + }, + "es": { + "limpiar": { + "cefr_source": "A1" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -574,15 +1100,35 @@ "source_id": "ili:i4857", "pos": "adjective", "translations": { - "en": ["enthusiastic"], - "it": ["caloroso", "entusiastico", "fervido", "entusiasta"], - "fr": ["courageux", "enthousiaste"] + "en": [ + "enthusiastic" + ], + "it": [ + "caloroso", + "entusiastico", + "fervido", + "entusiasta" + ], + "fr": [ + "courageux", + "enthousiaste" + ] + }, + "glosses": { + "en": [ + "having or showing great excitement and interest" + ] }, - "glosses": { "en": ["having or showing great excitement and interest"] }, "examples": { "en": [ - { "text": "enthusiastic crowds filled the streets", "source": "omw" }, - { "text": "an enthusiastic response", "source": "omw" }, + { + "text": "enthusiastic crowds filled the streets", + "source": "omw" + }, + { + "text": "an enthusiastic response", + "source": "omw" + }, { "text": "was enthusiastic about taking ballet lessons", "source": "omw" @@ -597,10 +1143,16 @@ "text": "Ha espresso un fervido desiderio di pace.", "source": "cefr" }, - { "text": "Era molto entusiasta del nuovo progetto.", "source": "cefr" } + { + "text": "Era molto entusiasta del nuovo progetto.", + "source": "cefr" + } ], "fr": [ - { "text": "C'est une personne très courageuse.", "source": "cefr" }, + { + "text": "C'est une personne très courageuse.", + "source": "cefr" + }, { "text": "Elle est très enthousiaste à l'idée de ce voyage.", "source": "cefr" @@ -608,15 +1160,29 @@ ] }, "votes": { - "en": { "enthusiastic": { "cefr_source": "B1" } }, + "en": { + "enthusiastic": { + "cefr_source": "B1" + } + }, "it": { - "caloroso": { "cefr_source": "B1" }, - "fervido": { "cefr_source": "C1" }, - "entusiasta": { "cefr_source": "B1" } + "caloroso": { + "cefr_source": "B1" + }, + "fervido": { + "cefr_source": "C1" + }, + "entusiasta": { + "cefr_source": "B1" + } }, "fr": { - "courageux": { "cefr_source": "A2" }, - "enthousiaste": { "cefr_source": "B1" } + "courageux": { + "cefr_source": "A2" + }, + "enthousiaste": { + "cefr_source": "B1" + } } }, "_sample_bucket": "has_cefr_vote" @@ -625,8 +1191,13 @@ "source_id": "ili:i104521", "pos": "noun", "translations": { - "en": ["veronica", "speedwell"], - "it": ["veronica"], + "en": [ + "veronica", + "speedwell" + ], + "it": [ + "veronica" + ], "de": [ "Allerweltsheil", "Grundheil", @@ -635,11 +1206,18 @@ "Köhlerkraut", "Schlangenkraut" ], - "fr": ["veronica", "véronique"] + "fr": [ + "veronica", + "véronique" + ] }, "glosses": { - "en": ["any plant of the genus Veronica"], - "de": ["jede Pflanze der Gattung Veronica"] + "en": [ + "any plant of the genus Veronica" + ], + "de": [ + "jede Pflanze der Gattung Veronica" + ] }, "examples": { "de": [ @@ -649,21 +1227,56 @@ } ] }, - "votes": { "de": { "Ehrenpreis": { "cefr_source": "C1" } } }, + "votes": { + "de": { + "Ehrenpreis": { + "cefr_source": "C1" + } + } + }, "_sample_bucket": "has_cefr_vote" }, { "source_id": "ili:i958", "pos": "adjective", - "translations": { "en": ["gracious"], "es": ["amable"] }, - "glosses": { "en": ["disposed to bestow favors"] }, + "translations": { + "en": [ + "gracious" + ], + "es": [ + "amable" + ] + }, + "glosses": { + "en": [ + "disposed to bestow favors" + ] + }, "examples": { - "en": [{ "text": "thanks to the gracious gods", "source": "omw" }], - "es": [{ "text": "Siempre es muy amable con todos.", "source": "cefr" }] + "en": [ + { + "text": "thanks to the gracious gods", + "source": "omw" + } + ], + "es": [ + { + "text": "Siempre es muy amable con todos.", + "source": "cefr" + } + ] }, "votes": { - "en": { "gracious": { "cefr_source": "B2" } }, - "es": { "amable": { "cefr_source": "A2" } } + "en": { + "gracious": { + "cefr_source": "B2" + } + }, + "es": { + "amable": { + "cefr_source": "A2" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -671,11 +1284,23 @@ "source_id": "ili:i109447", "pos": "noun", "translations": { - "en": ["declension"], - "it": ["declinazione"], - "es": ["declinación"], - "de": ["Deklination", "Ortsmissweisung", "Missweisung"], - "fr": ["déclinaison"] + "en": [ + "declension" + ], + "it": [ + "declinazione" + ], + "es": [ + "declinación" + ], + "de": [ + "Deklination", + "Ortsmissweisung", + "Missweisung" + ], + "fr": [ + "déclinaison" + ] }, "glosses": { "en": [ @@ -693,12 +1318,23 @@ } ], "fr": [ - { "text": "En latin, les noms ont des déclinaisons.", "source": "cefr" } + { + "text": "En latin, les noms ont des déclinaisons.", + "source": "cefr" + } ] }, "votes": { - "it": { "declinazione": { "cefr_source": "B2" } }, - "fr": { "déclinaison": { "cefr_source": "C1" } } + "it": { + "declinazione": { + "cefr_source": "B2" + } + }, + "fr": { + "déclinaison": { + "cefr_source": "C1" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -706,14 +1342,29 @@ "source_id": "ili:i18812", "pos": "adverb", "translations": { - "en": ["fairly", "fair", "evenhandedly"], - "es": ["con justicia", "imparcialmente", "justamente"] + "en": [ + "fairly", + "fair", + "evenhandedly" + ], + "es": [ + "con justicia", + "imparcialmente", + "justamente" + ] }, "glosses": { - "en": ["without favoring one party, in a fair evenhanded manner"] + "en": [ + "without favoring one party, in a fair evenhanded manner" + ] }, "examples": { - "en": [{ "text": "deal fairly with one another", "source": "omw" }], + "en": [ + { + "text": "deal fairly with one another", + "source": "omw" + } + ], "es": [ { "text": "Llegó justamente a tiempo para la reunión.", @@ -722,8 +1373,16 @@ ] }, "votes": { - "en": { "fairly": { "cefr_source": "B1" } }, - "es": { "justamente": { "cefr_source": "B2" } } + "en": { + "fairly": { + "cefr_source": "B1" + } + }, + "es": { + "justamente": { + "cefr_source": "B2" + } + } }, "_sample_bucket": "has_cefr_vote" }, @@ -731,11 +1390,23 @@ "source_id": "ili:i44747", "pos": "noun", "translations": { - "en": ["Centrocercus", "genus Centrocercus"], - "es": ["Centrocercus", "género Centrocercus"], - "fr": ["centrocercus"] + "en": [ + "Centrocercus", + "genus Centrocercus" + ], + "es": [ + "Centrocercus", + "género Centrocercus" + ], + "fr": [ + "centrocercus" + ] + }, + "glosses": { + "en": [ + "sage grouse" + ] }, - "glosses": { "en": ["sage grouse"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_cefr_vote" @@ -743,8 +1414,16 @@ { "source_id": "ili:i20736", "pos": "adverb", - "translations": { "en": ["insinuatingly"] }, - "glosses": { "en": ["in an insinuating manner"] }, + "translations": { + "en": [ + "insinuatingly" + ] + }, + "glosses": { + "en": [ + "in an insinuating manner" + ] + }, "examples": { "en": [ { @@ -759,8 +1438,16 @@ { "source_id": "ili:i25017", "pos": "verb", - "translations": { "en": ["superordinate"] }, - "glosses": { "en": ["place in a superior order or rank"] }, + "translations": { + "en": [ + "superordinate" + ] + }, + "glosses": { + "en": [ + "place in a superior order or rank" + ] + }, "examples": { "en": [ { @@ -776,7 +1463,9 @@ "source_id": "ili:i46616", "pos": "noun", "translations": { - "en": ["sand cat"], + "en": [ + "sand cat" + ], "fr": [ "chat de marguerite", "chat du désert", @@ -784,7 +1473,11 @@ "chat des sables" ] }, - "glosses": { "en": ["a desert wildcat"] }, + "glosses": { + "en": [ + "a desert wildcat" + ] + }, "examples": {}, "votes": {}, "_sample_bucket": "no_cefr_vote" @@ -792,9 +1485,15 @@ { "source_id": "ili:i83491", "pos": "noun", - "translations": { "en": ["Bangor"] }, + "translations": { + "en": [ + "Bangor" + ] + }, "glosses": { - "en": ["a university town in northwestern Wales on the Menai Strait"] + "en": [ + "a university town in northwestern Wales on the Menai Strait" + ] }, "examples": {}, "votes": {}, @@ -804,11 +1503,19 @@ "source_id": "ili:i72819", "pos": "noun", "translations": { - "en": ["Missouri"], - "fr": ["Saint Peters", "Joplin", "Missouri"] + "en": [ + "Missouri" + ], + "fr": [ + "Saint Peters", + "Joplin", + "Missouri" + ] }, "glosses": { - "en": ["a dialect of the Chiwere language spoken by the Missouri"] + "en": [ + "a dialect of the Chiwere language spoken by the Missouri" + ] }, "examples": {}, "votes": {}, @@ -818,9 +1525,18 @@ "source_id": "ili:i99797", "pos": "noun", "translations": { - "en": ["prickly poppy", "argemone", "white thistle", "devil's fig"], - "es": ["argemone"], - "fr": ["argemone"] + "en": [ + "prickly poppy", + "argemone", + "white thistle", + "devil's fig" + ], + "es": [ + "argemone" + ], + "fr": [ + "argemone" + ] }, "glosses": { "en": [ @@ -835,12 +1551,26 @@ "source_id": "ili:i90317", "pos": "noun", "translations": { - "en": ["great-uncle", "granduncle"], - "it": ["protio", "prozio"], - "es": ["tío abuelo"], - "fr": ["grand-oncle"] + "en": [ + "great-uncle", + "granduncle" + ], + "it": [ + "protio", + "prozio" + ], + "es": [ + "tío abuelo" + ], + "fr": [ + "grand-oncle" + ] + }, + "glosses": { + "en": [ + "an uncle of your father or mother" + ] }, - "glosses": { "en": ["an uncle of your father or mother"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_cefr_vote" @@ -849,10 +1579,19 @@ "source_id": "ili:i53881", "pos": "noun", "translations": { - "en": ["flour bin"], - "es": ["frasco de harina", "tarro de harina"] + "en": [ + "flour bin" + ], + "es": [ + "frasco de harina", + "tarro de harina" + ] + }, + "glosses": { + "en": [ + "a bin for holding flour" + ] }, - "glosses": { "en": ["a bin for holding flour"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_cefr_vote" @@ -860,8 +1599,19 @@ { "source_id": "ili:i58210", "pos": "noun", - "translations": { "en": ["road map"], "fr": ["carte routière"] }, - "glosses": { "en": ["a map showing roads (for automobile travel)"] }, + "translations": { + "en": [ + "road map" + ], + "fr": [ + "carte routière" + ] + }, + "glosses": { + "en": [ + "a map showing roads (for automobile travel)" + ] + }, "examples": {}, "votes": {}, "_sample_bucket": "no_cefr_vote" @@ -870,10 +1620,15 @@ "source_id": "ili:i82638", "pos": "noun", "translations": { - "en": ["South American country", "South American nation"] + "en": [ + "South American country", + "South American nation" + ] }, "glosses": { - "en": ["any one of the countries occupying the South American continent"] + "en": [ + "any one of the countries occupying the South American continent" + ] }, "examples": {}, "votes": {}, @@ -883,9 +1638,17 @@ "source_id": "ili:i71111", "pos": "noun", "translations": { - "en": ["weekly"], - "it": ["ebdomadario", "eddomadario", "settimanale"], - "fr": ["hebdomadaire"] + "en": [ + "weekly" + ], + "it": [ + "ebdomadario", + "eddomadario", + "settimanale" + ], + "fr": [ + "hebdomadaire" + ] }, "glosses": { "en": [ @@ -899,17 +1662,47 @@ { "source_id": "ili:i10131", "pos": "adjective", - "translations": { "en": ["embattled"], "it": ["GAP!", "in difficoltà"] }, - "glosses": { "en": ["prepared for battle"] }, - "examples": { "en": [{ "text": "an embattled city", "source": "omw" }] }, + "translations": { + "en": [ + "embattled" + ], + "it": [ + "GAP!", + "in difficoltà" + ] + }, + "glosses": { + "en": [ + "prepared for battle" + ] + }, + "examples": { + "en": [ + { + "text": "an embattled city", + "source": "omw" + } + ] + }, "votes": {}, "_sample_bucket": "no_cefr_vote" }, { "source_id": "ili:i108195", "pos": "noun", - "translations": { "en": ["mass unit"], "es": ["unidad de masa"] }, - "glosses": { "en": ["a unit of measurement for mass"] }, + "translations": { + "en": [ + "mass unit" + ], + "es": [ + "unidad de masa" + ] + }, + "glosses": { + "en": [ + "a unit of measurement for mass" + ] + }, "examples": {}, "votes": {}, "_sample_bucket": "no_cefr_vote" @@ -917,7 +1710,11 @@ { "source_id": "ili:i82225", "pos": "noun", - "translations": { "en": ["Wrangell-St. Elias National Park"] }, + "translations": { + "en": [ + "Wrangell-St. Elias National Park" + ] + }, "glosses": { "en": [ "the largest national park of the United States; located in Alaska" @@ -931,10 +1728,20 @@ "source_id": "ili:i47159", "pos": "noun", "translations": { - "en": ["Fenusa", "genus-Fenusa"], - "es": ["Fenusa", "género Fenusa"] + "en": [ + "Fenusa", + "genus-Fenusa" + ], + "es": [ + "Fenusa", + "género Fenusa" + ] + }, + "glosses": { + "en": [ + "birch leaf miner" + ] }, - "glosses": { "en": ["birch leaf miner"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_cefr_vote" @@ -942,8 +1749,16 @@ { "source_id": "ili:i106504", "pos": "noun", - "translations": { "en": ["entail"] }, - "glosses": { "en": ["land received by fee tail"] }, + "translations": { + "en": [ + "entail" + ] + }, + "glosses": { + "en": [ + "land received by fee tail" + ] + }, "examples": {}, "votes": {}, "_sample_bucket": "no_cefr_vote" @@ -952,10 +1767,19 @@ "source_id": "ili:i46047", "pos": "noun", "translations": { - "en": ["Polynesian tattler", "Heteroscelus incanus"], - "fr": ["heteroscelus incanus"] + "en": [ + "Polynesian tattler", + "Heteroscelus incanus" + ], + "fr": [ + "heteroscelus incanus" + ] + }, + "glosses": { + "en": [ + "tattler of Pacific coastal regions" + ] }, - "glosses": { "en": ["tattler of Pacific coastal regions"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_cefr_vote" @@ -963,7 +1787,11 @@ { "source_id": "ili:i71598", "pos": "noun", - "translations": { "en": ["market letter"] }, + "translations": { + "en": [ + "market letter" + ] + }, "glosses": { "en": [ "a newsletter written by an analyst of the stock market and sold to subscribers" @@ -977,11 +1805,29 @@ "source_id": "ili:i115719", "pos": "noun", "translations": { - "en": ["monosaccharide", "monosaccharose", "simple sugar"], - "it": ["manosio", "monosaccaride", "monosio", "monoso"], - "es": ["monosacárido"], - "de": ["Monosaccharid", "Einfachzucker"], - "fr": ["ose", "Ose", "monosaccharide"] + "en": [ + "monosaccharide", + "monosaccharose", + "simple sugar" + ], + "it": [ + "manosio", + "monosaccaride", + "monosio", + "monoso" + ], + "es": [ + "monosacárido" + ], + "de": [ + "Monosaccharid", + "Einfachzucker" + ], + "fr": [ + "ose", + "Ose", + "monosaccharide" + ] }, "glosses": { "en": [ @@ -999,7 +1845,11 @@ "source_id": "ili:i74228", "pos": "noun", "translations": { - "en": ["negotiation", "dialogue", "talks"], + "en": [ + "negotiation", + "dialogue", + "talks" + ], "it": [ "contrattazione", "deal", @@ -1008,13 +1858,27 @@ "negoziazione", "trattativa" ], - "es": ["gestión", "negociación", "tramitación"], - "de": ["Besprechung", "Verhandlung"], - "fr": ["dialogue", "négociation"] + "es": [ + "gestión", + "negociación", + "tramitación" + ], + "de": [ + "Besprechung", + "Verhandlung" + ], + "fr": [ + "dialogue", + "négociation" + ] }, "glosses": { - "en": ["a discussion intended to produce an agreement"], - "de": ["Diskussion zur Ausarbeitung eines Abkommens"] + "en": [ + "a discussion intended to produce an agreement" + ], + "de": [ + "Diskussion zur Ausarbeitung eines Abkommens" + ] }, "examples": { "en": [ @@ -1022,15 +1886,24 @@ "text": "the buyout negotiation lasted several days", "source": "omw" }, - { "text": "they disagreed but kept an open dialogue", "source": "omw" }, - { "text": "talks between Israelis and Palestinians", "source": "omw" } + { + "text": "they disagreed but kept an open dialogue", + "source": "omw" + }, + { + "text": "talks between Israelis and Palestinians", + "source": "omw" + } ], "it": [ { "text": "La contrattazione collettiva è importante per i lavoratori.", "source": "cefr" }, - { "text": "Abbiamo chiuso un buon deal.", "source": "cefr" }, + { + "text": "Abbiamo chiuso un buon deal.", + "source": "cefr" + }, { "text": "È importante mantenere un dialogo aperto.", "source": "cefr" @@ -1043,7 +1916,10 @@ "text": "Le negoziazioni per il nuovo contratto sono state lunghe e complesse.", "source": "cefr" }, - { "text": "Le trattative sono in corso.", "source": "cefr" } + { + "text": "Le trattative sono in corso.", + "source": "cefr" + } ], "de": [ { @@ -1066,8 +1942,14 @@ } ], "es": [ - { "text": "La gestión del proyecto fue excelente.", "source": "cefr" }, - { "text": "Las negociaciones fueron difíciles.", "source": "cefr" }, + { + "text": "La gestión del proyecto fue excelente.", + "source": "cefr" + }, + { + "text": "Las negociaciones fueron difíciles.", + "source": "cefr" + }, { "text": "La tramitación de los documentos puede llevar tiempo.", "source": "cefr" @@ -1076,29 +1958,59 @@ }, "votes": { "en": { - "negotiation": { "cefr_source": "B2" }, - "dialogue": { "cefr_source": "B2" } + "negotiation": { + "cefr_source": "B2" + }, + "dialogue": { + "cefr_source": "B2" + } }, "it": { - "contrattazione": { "cefr_source": "B2" }, - "deal": { "cefr_source": "B1" }, - "dialogo": { "cefr_source": "B1" }, - "negoziato": { "cefr_source": "B2" }, - "negoziazione": { "cefr_source": "B2" }, - "trattativa": { "cefr_source": "B2" } + "contrattazione": { + "cefr_source": "B2" + }, + "deal": { + "cefr_source": "B1" + }, + "dialogo": { + "cefr_source": "B1" + }, + "negoziato": { + "cefr_source": "B2" + }, + "negoziazione": { + "cefr_source": "B2" + }, + "trattativa": { + "cefr_source": "B2" + } }, "de": { - "Besprechung": { "cefr_source": "B1" }, - "Verhandlung": { "cefr_source": "B2" } + "Besprechung": { + "cefr_source": "B1" + }, + "Verhandlung": { + "cefr_source": "B2" + } }, "fr": { - "dialogue": { "cefr_source": "B1" }, - "négociation": { "cefr_source": "B2" } + "dialogue": { + "cefr_source": "B1" + }, + "négociation": { + "cefr_source": "B2" + } }, "es": { - "gestión": { "cefr_source": "B2" }, - "negociación": { "cefr_source": "B2" }, - "tramitación": { "cefr_source": "B2" } + "gestión": { + "cefr_source": "B2" + }, + "negociación": { + "cefr_source": "B2" + }, + "tramitación": { + "cefr_source": "B2" + } } }, "_sample_bucket": "has_glosses_and_examples" @@ -1107,8 +2019,13 @@ "source_id": "ili:i408", "pos": "adjective", "translations": { - "en": ["aground"], - "es": ["encallado", "varado"], + "en": [ + "aground" + ], + "es": [ + "encallado", + "varado" + ], "de": [ "aufgrund", "dank", @@ -1120,28 +2037,48 @@ ] }, "glosses": { - "en": ["stuck in a place where a ship can no longer float"], + "en": [ + "stuck in a place where a ship can no longer float" + ], "de": [ "an einer Stelle feststecken, an der ein Schiff nicht mehr schwimmen kann" ] }, "examples": { "en": [ - { "text": "a ship aground offshore", "source": "omw" }, + { + "text": "a ship aground offshore", + "source": "omw" + }, { "text": "a boat aground on the beach waiting for the tide to lift it", "source": "omw" } ], - "es": [{ "text": "El barco quedó varado en la arena.", "source": "cefr" }] + "es": [ + { + "text": "El barco quedó varado en la arena.", + "source": "cefr" + } + ] + }, + "votes": { + "es": { + "varado": { + "cefr_source": "B2" + } + } }, - "votes": { "es": { "varado": { "cefr_source": "B2" } } }, "_sample_bucket": "has_glosses_and_examples" }, { "source_id": "ili:i41575", "pos": "noun", - "translations": { "en": ["walkout"] }, + "translations": { + "en": [ + "walkout" + ] + }, "glosses": { "en": [ "the act of walking out (of a meeting or organization) as a sign of protest" @@ -1155,14 +2092,31 @@ } ] }, - "votes": { "en": { "walkout": { "cefr_source": "B2" } } }, + "votes": { + "en": { + "walkout": { + "cefr_source": "B2" + } + } + }, "_sample_bucket": "has_glosses_and_examples" }, { "source_id": "ili:i67480", "pos": "noun", - "translations": { "en": ["tasting"], "fr": ["dégustation"] }, - "glosses": { "en": ["a small amount (especially of food or wine)"] }, + "translations": { + "en": [ + "tasting" + ], + "fr": [ + "dégustation" + ] + }, + "glosses": { + "en": [ + "a small amount (especially of food or wine)" + ] + }, "examples": { "fr": [ { @@ -1172,19 +2126,40 @@ ] }, "votes": { - "en": { "tasting": { "cefr_source": "B1" } }, - "fr": { "dégustation": { "cefr_source": "B1" } } + "en": { + "tasting": { + "cefr_source": "B1" + } + }, + "fr": { + "dégustation": { + "cefr_source": "B1" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, { "source_id": "ili:i11256", "pos": "adjective", - "translations": { "en": ["hobnailed"] }, - "glosses": { - "en": ["marked by the wearing of heavy boots studded with hobnails"] + "translations": { + "en": [ + "hobnailed" + ] + }, + "glosses": { + "en": [ + "marked by the wearing of heavy boots studded with hobnails" + ] + }, + "examples": { + "en": [ + { + "text": "hobnailed laborers", + "source": "omw" + } + ] }, - "examples": { "en": [{ "text": "hobnailed laborers", "source": "omw" }] }, "votes": {}, "_sample_bucket": "has_glosses_and_examples" }, @@ -1192,74 +2167,145 @@ "source_id": "ili:i86151", "pos": "noun", "translations": { - "en": ["sediment", "deposit"], - "it": ["deposito", "posatura", "sedimento"], - "es": ["depósito", "sedimento"], + "en": [ + "sediment", + "deposit" + ], + "it": [ + "deposito", + "posatura", + "sedimento" + ], + "es": [ + "depósito", + "sedimento" + ], "de": [ "Ablagerung", "Sedimentation", "Sedimentierung", "Sedimentbildung" ], - "fr": ["sédiment", "dépôt"] + "fr": [ + "sédiment", + "dépôt" + ] }, "glosses": { - "en": ["matter that has been deposited by some natural process"], - "de": ["Materie, die durch einen natürlichen Prozess abgelagert wurde"] + "en": [ + "matter that has been deposited by some natural process" + ], + "de": [ + "Materie, die durch einen natürlichen Prozess abgelagert wurde" + ] }, "examples": { "it": [ - { "text": "Ho lasciato i bagagli al deposito.", "source": "cefr" }, + { + "text": "Ho lasciato i bagagli al deposito.", + "source": "cefr" + }, { "text": "C'era un sedimento sul fondo della bottiglia.", "source": "cefr" } ], "de": [ - { "text": "Es gab Ablagerungen in den Rohren.", "source": "cefr" } + { + "text": "Es gab Ablagerungen in den Rohren.", + "source": "cefr" + } ], "fr": [ { "text": "Le sédiment au fond du lac est très fin.", "source": "cefr" }, - { "text": "J'ai fait un dépôt à la banque.", "source": "cefr" } + { + "text": "J'ai fait un dépôt à la banque.", + "source": "cefr" + } ], - "es": [{ "text": "Hice un depósito en el banco.", "source": "cefr" }] + "es": [ + { + "text": "Hice un depósito en el banco.", + "source": "cefr" + } + ] }, "votes": { "en": { - "sediment": { "cefr_source": "C1" }, - "deposit": { "cefr_source": "B1" } + "sediment": { + "cefr_source": "C1" + }, + "deposit": { + "cefr_source": "B1" + } }, "it": { - "deposito": { "cefr_source": "B1" }, - "sedimento": { "cefr_source": "B2" } + "deposito": { + "cefr_source": "B1" + }, + "sedimento": { + "cefr_source": "B2" + } + }, + "de": { + "Ablagerung": { + "cefr_source": "B2" + } }, - "de": { "Ablagerung": { "cefr_source": "B2" } }, "fr": { - "sédiment": { "cefr_source": "B2" }, - "dépôt": { "cefr_source": "B1" } + "sédiment": { + "cefr_source": "B2" + }, + "dépôt": { + "cefr_source": "B1" + } }, - "es": { "depósito": { "cefr_source": "B1" } } + "es": { + "depósito": { + "cefr_source": "B1" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, { "source_id": "ili:i45550", "pos": "noun", - "translations": { "en": ["conch"], "fr": ["conque"] }, + "translations": { + "en": [ + "conch" + ], + "fr": [ + "conque" + ] + }, "glosses": { "en": [ "any of various edible tropical marine gastropods of the genus Strombus having a brightly-colored spiral shell with large outer lip" ] }, "examples": { - "fr": [{ "text": "On entend la mer dans une conque.", "source": "cefr" }] + "fr": [ + { + "text": "On entend la mer dans une conque.", + "source": "cefr" + } + ] }, "votes": { - "en": { "conch": { "cefr_source": "B1" } }, - "fr": { "conque": { "cefr_source": "B2" } } + "en": { + "conch": { + "cefr_source": "B1" + } + }, + "fr": { + "conque": { + "cefr_source": "B2" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, @@ -1267,9 +2313,15 @@ "source_id": "ili:i117521", "pos": "noun", "translations": { - "en": ["moratorium"], - "it": ["moratoria"], - "fr": ["moratoire"] + "en": [ + "moratorium" + ], + "it": [ + "moratoria" + ], + "fr": [ + "moratoire" + ] }, "glosses": { "en": [ @@ -1291,9 +2343,21 @@ ] }, "votes": { - "en": { "moratorium": { "cefr_source": "C1" } }, - "it": { "moratoria": { "cefr_source": "C1" } }, - "fr": { "moratoire": { "cefr_source": "C1" } } + "en": { + "moratorium": { + "cefr_source": "C1" + } + }, + "it": { + "moratoria": { + "cefr_source": "C1" + } + }, + "fr": { + "moratoire": { + "cefr_source": "C1" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, @@ -1301,10 +2365,20 @@ "source_id": "ili:i31764", "pos": "verb", "translations": { - "en": ["return"], - "fr": ["rendre", "retourner", "revenir"] + "en": [ + "return" + ], + "fr": [ + "rendre", + "retourner", + "revenir" + ] + }, + "glosses": { + "en": [ + "return to a previous position; in mathematics" + ] }, - "glosses": { "en": ["return to a previous position; in mathematics"] }, "examples": { "en": [ { @@ -1321,14 +2395,23 @@ "text": "Je dois retourner ce livre à la bibliothèque.", "source": "cefr" }, - { "text": "Je dois revenir demain.", "source": "cefr" } + { + "text": "Je dois revenir demain.", + "source": "cefr" + } ] }, "votes": { "fr": { - "rendre": { "cefr_source": "A2" }, - "retourner": { "cefr_source": "A2" }, - "revenir": { "cefr_source": "A1" } + "rendre": { + "cefr_source": "A2" + }, + "retourner": { + "cefr_source": "A2" + }, + "revenir": { + "cefr_source": "A1" + } } }, "_sample_bucket": "has_glosses_and_examples" @@ -1337,9 +2420,17 @@ "source_id": "ili:i48149", "pos": "noun", "translations": { - "en": ["post horse", "post-horse", "poster"], - "it": ["cavallo di posta"], - "fr": ["affiche"] + "en": [ + "post horse", + "post-horse", + "poster" + ], + "it": [ + "cavallo di posta" + ], + "fr": [ + "affiche" + ] }, "glosses": { "en": [ @@ -1348,12 +2439,23 @@ }, "examples": { "fr": [ - { "text": "L'affiche du concert est très colorée.", "source": "cefr" } + { + "text": "L'affiche du concert est très colorée.", + "source": "cefr" + } ] }, "votes": { - "en": { "poster": { "cefr_source": "A2" } }, - "fr": { "affiche": { "cefr_source": "A2" } } + "en": { + "poster": { + "cefr_source": "A2" + } + }, + "fr": { + "affiche": { + "cefr_source": "A2" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, @@ -1361,20 +2463,47 @@ "source_id": "ili:i51126", "pos": "noun", "translations": { - "en": ["brickwork"], - "it": ["GAP!", "muratura in mattoni"], - "es": ["aparejo", "calicanto", "enladrillado", "mampostería"], - "fr": ["appareil"] + "en": [ + "brickwork" + ], + "it": [ + "GAP!", + "muratura in mattoni" + ], + "es": [ + "aparejo", + "calicanto", + "enladrillado", + "mampostería" + ], + "fr": [ + "appareil" + ] + }, + "glosses": { + "en": [ + "masonry done with bricks and mortar" + ] }, - "glosses": { "en": ["masonry done with bricks and mortar"] }, "examples": { "fr": [ - { "text": "J'ai acheté un nouvel appareil photo.", "source": "cefr" } + { + "text": "J'ai acheté un nouvel appareil photo.", + "source": "cefr" + } ] }, "votes": { - "en": { "brickwork": { "cefr_source": "B2" } }, - "fr": { "appareil": { "cefr_source": "B1" } } + "en": { + "brickwork": { + "cefr_source": "B2" + } + }, + "fr": { + "appareil": { + "cefr_source": "B1" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, @@ -1382,26 +2511,41 @@ "source_id": "ili:i17542", "pos": "adjective", "translations": { - "en": ["interdisciplinary"], - "it": ["interdisciplinare", "multidisciplinare"], + "en": [ + "interdisciplinary" + ], + "it": [ + "interdisciplinare", + "multidisciplinare" + ], "de": [ "multidisziplinär", "fachübergreifend", "interdisziplinär", "fächerübergreifend" ], - "fr": ["interdisciplinaire"] + "fr": [ + "interdisciplinaire" + ] }, "glosses": { "en": [ "drawing from or characterized by participation of two or more fields of study" ], - "de": ["die Zusammenarbeit mehrerer Disziplinen betreffend\">"] + "de": [ + "die Zusammenarbeit mehrerer Disziplinen betreffend\">" + ] }, "examples": { "en": [ - { "text": "interdisciplinary studies", "source": "omw" }, - { "text": "an interdisciplinary conference", "source": "omw" } + { + "text": "interdisciplinary studies", + "source": "omw" + }, + { + "text": "an interdisciplinary conference", + "source": "omw" + } ], "it": [ { @@ -1423,10 +2567,26 @@ ] }, "votes": { - "en": { "interdisciplinary": { "cefr_source": "C1" } }, - "it": { "interdisciplinare": { "cefr_source": "C1" } }, - "de": { "interdisziplinär": { "cefr_source": "C1" } }, - "fr": { "interdisciplinaire": { "cefr_source": "C1" } } + "en": { + "interdisciplinary": { + "cefr_source": "C1" + } + }, + "it": { + "interdisciplinare": { + "cefr_source": "C1" + } + }, + "de": { + "interdisziplinär": { + "cefr_source": "C1" + } + }, + "fr": { + "interdisciplinaire": { + "cefr_source": "C1" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, @@ -1434,9 +2594,15 @@ "source_id": "ili:i69459", "pos": "noun", "translations": { - "en": ["new edition"], - "it": ["riedizione"], - "fr": ["new edition"] + "en": [ + "new edition" + ], + "it": [ + "riedizione" + ], + "fr": [ + "new edition" + ] }, "glosses": { "en": [ @@ -1451,19 +2617,34 @@ } ] }, - "votes": { "it": { "riedizione": { "cefr_source": "C1" } } }, + "votes": { + "it": { + "riedizione": { + "cefr_source": "C1" + } + } + }, "_sample_bucket": "has_glosses_and_examples" }, { "source_id": "ili:i75841", "pos": "noun", "translations": { - "en": ["stampede"], - "de": ["Stampede", "Herdenpanik"], - "fr": ["débandade"] + "en": [ + "stampede" + ], + "de": [ + "Stampede", + "Herdenpanik" + ], + "fr": [ + "débandade" + ] }, "glosses": { - "en": ["a wild headlong rush of frightened animals (horses or cattle)"], + "en": [ + "a wild headlong rush of frightened animals (horses or cattle)" + ], "de": [ "eine wilde, kopfüber laufende Flucht von verängstigten Tieren (Pferden oder Rindern)" ] @@ -1477,8 +2658,16 @@ ] }, "votes": { - "en": { "stampede": { "cefr_source": "B2" } }, - "fr": { "débandade": { "cefr_source": "C1" } } + "en": { + "stampede": { + "cefr_source": "B2" + } + }, + "fr": { + "débandade": { + "cefr_source": "C1" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, @@ -1486,11 +2675,22 @@ "source_id": "ili:i67108", "pos": "noun", "translations": { - "en": ["stocktaking", "stock-taking"], - "it": ["inventario"], - "es": ["balance"] + "en": [ + "stocktaking", + "stock-taking" + ], + "it": [ + "inventario" + ], + "es": [ + "balance" + ] + }, + "glosses": { + "en": [ + "reappraisal of a situation or position or outlook" + ] }, - "glosses": { "en": ["reappraisal of a situation or position or outlook"] }, "examples": { "it": [ { @@ -1506,8 +2706,16 @@ ] }, "votes": { - "it": { "inventario": { "cefr_source": "B2" } }, - "es": { "balance": { "cefr_source": "B1" } } + "it": { + "inventario": { + "cefr_source": "B2" + } + }, + "es": { + "balance": { + "cefr_source": "B1" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, @@ -1525,7 +2733,9 @@ "whacky", "zany" ], - "es": ["tonto"], + "es": [ + "tonto" + ], "de": [ "albern", "naiv", @@ -1539,69 +2749,164 @@ "infantil", "puerilistisch" ], - "fr": ["déraisonnable", "fou", "drôle", "aberrant"] + "fr": [ + "déraisonnable", + "fou", + "drôle", + "aberrant" + ] + }, + "glosses": { + "en": [ + "ludicrous, foolish" + ], + "de": [ + "lächerlich, töricht" + ] }, - "glosses": { "en": ["ludicrous, foolish"], "de": ["lächerlich, töricht"] }, "examples": { "en": [ { "text": "gave me a cockamamie reason for not going", "source": "omw" }, - { "text": "wore a goofy hat", "source": "omw" }, - { "text": "a silly idea", "source": "omw" }, - { "text": "some wacky plan for selling more books", "source": "omw" } + { + "text": "wore a goofy hat", + "source": "omw" + }, + { + "text": "a silly idea", + "source": "omw" + }, + { + "text": "some wacky plan for selling more books", + "source": "omw" + } ], "de": [ - { "text": "Hör auf, so albern zu sein!", "source": "cefr" }, - { "text": "Sie ist manchmal etwas naiv.", "source": "cefr" }, - { "text": "Die Früchte sind noch unreif.", "source": "cefr" }, - { "text": "Sie hat eine sehr kindliche Freude.", "source": "cefr" }, - { "text": "Sein Verhalten war ziemlich kindisch.", "source": "cefr" } + { + "text": "Hör auf, so albern zu sein!", + "source": "cefr" + }, + { + "text": "Sie ist manchmal etwas naiv.", + "source": "cefr" + }, + { + "text": "Die Früchte sind noch unreif.", + "source": "cefr" + }, + { + "text": "Sie hat eine sehr kindliche Freude.", + "source": "cefr" + }, + { + "text": "Sein Verhalten war ziemlich kindisch.", + "source": "cefr" + } ], "fr": [ - { "text": "Ses exigences sont déraisonnables.", "source": "cefr" }, - { "text": "C'est une idée folle.", "source": "cefr" }, - { "text": "C'est une histoire drôle.", "source": "cefr" }, + { + "text": "Ses exigences sont déraisonnables.", + "source": "cefr" + }, + { + "text": "C'est une idée folle.", + "source": "cefr" + }, + { + "text": "C'est une histoire drôle.", + "source": "cefr" + }, { "text": "Son comportement était aberrant et choquant.", "source": "cefr" } ], - "es": [{ "text": "No seas tonto, eso no es verdad.", "source": "cefr" }] + "es": [ + { + "text": "No seas tonto, eso no es verdad.", + "source": "cefr" + } + ] }, "votes": { "en": { - "goofy": { "cefr_source": "B1" }, - "sappy": { "cefr_source": "B2" }, - "silly": { "cefr_source": "A2" }, - "wacky": { "cefr_source": "B2" }, - "zany": { "cefr_source": "B2" } + "goofy": { + "cefr_source": "B1" + }, + "sappy": { + "cefr_source": "B2" + }, + "silly": { + "cefr_source": "A2" + }, + "wacky": { + "cefr_source": "B2" + }, + "zany": { + "cefr_source": "B2" + } }, "de": { - "albern": { "cefr_source": "B1" }, - "naiv": { "cefr_source": "B1" }, - "unreif": { "cefr_source": "B1" }, - "kindlich": { "cefr_source": "B1" }, - "kindisch": { "cefr_source": "B1" } + "albern": { + "cefr_source": "B1" + }, + "naiv": { + "cefr_source": "B1" + }, + "unreif": { + "cefr_source": "B1" + }, + "kindlich": { + "cefr_source": "B1" + }, + "kindisch": { + "cefr_source": "B1" + } }, "fr": { - "déraisonnable": { "cefr_source": "B2" }, - "fou": { "cefr_source": "B1" }, - "drôle": { "cefr_source": "A2" }, - "aberrant": { "cefr_source": "C1" } + "déraisonnable": { + "cefr_source": "B2" + }, + "fou": { + "cefr_source": "B1" + }, + "drôle": { + "cefr_source": "A2" + }, + "aberrant": { + "cefr_source": "C1" + } }, - "es": { "tonto": { "cefr_source": "A2" } } + "es": { + "tonto": { + "cefr_source": "A2" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, { "source_id": "ili:i1291", "pos": "adjective", - "translations": { "en": ["unifacial"] }, - "glosses": { "en": ["having but one principal or specialized surface"] }, + "translations": { + "en": [ + "unifacial" + ] + }, + "glosses": { + "en": [ + "having but one principal or specialized surface" + ] + }, "examples": { - "en": [{ "text": "a primitive unifacial flint tool", "source": "omw" }] + "en": [ + { + "text": "a primitive unifacial flint tool", + "source": "omw" + } + ] }, "votes": {}, "_sample_bucket": "has_glosses_and_examples" @@ -1610,11 +2915,26 @@ "source_id": "ili:i73668", "pos": "noun", "translations": { - "en": ["cantata", "oratorio"], - "it": ["cantata", "oratorio"], - "es": ["oratorio"], - "de": ["Andachtsraum", "Oratorium", "Gebetsraum"], - "fr": ["oratorio", "cantate"] + "en": [ + "cantata", + "oratorio" + ], + "it": [ + "cantata", + "oratorio" + ], + "es": [ + "oratorio" + ], + "de": [ + "Andachtsraum", + "Oratorium", + "Gebetsraum" + ], + "fr": [ + "oratorio", + "cantate" + ] }, "glosses": { "en": [ @@ -1645,39 +2965,91 @@ ] }, "votes": { - "it": { "oratorio": { "cefr_source": "B1" } }, - "de": { "Oratorium": { "cefr_source": "C1" } }, - "es": { "oratorio": { "cefr_source": "C1" } } + "it": { + "oratorio": { + "cefr_source": "B1" + } + }, + "de": { + "Oratorium": { + "cefr_source": "C1" + } + }, + "es": { + "oratorio": { + "cefr_source": "C1" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, { "source_id": "ili:i39774", "pos": "noun", - "translations": { "en": ["respiration"], "es": ["respiración"] }, - "glosses": { "en": ["a single complete act of breathing in and out"] }, - "examples": { - "en": [{ "text": "thirty respirations per minute", "source": "omw" }], + "translations": { + "en": [ + "respiration" + ], "es": [ - { "text": "Su respiración era lenta y profunda.", "source": "cefr" } + "respiración" + ] + }, + "glosses": { + "en": [ + "a single complete act of breathing in and out" + ] + }, + "examples": { + "en": [ + { + "text": "thirty respirations per minute", + "source": "omw" + } + ], + "es": [ + { + "text": "Su respiración era lenta y profunda.", + "source": "cefr" + } ] }, "votes": { - "en": { "respiration": { "cefr_source": "B2" } }, - "es": { "respiración": { "cefr_source": "B1" } } + "en": { + "respiration": { + "cefr_source": "B2" + } + }, + "es": { + "respiración": { + "cefr_source": "B1" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, { "source_id": "ili:i28838", "pos": "verb", - "translations": { "en": ["unplug", "disconnect"], "fr": ["débrancher"] }, + "translations": { + "en": [ + "unplug", + "disconnect" + ], + "fr": [ + "débrancher" + ] + }, "glosses": { - "en": ["pull the plug of (electrical appliances) and render inoperable"] + "en": [ + "pull the plug of (electrical appliances) and render inoperable" + ] }, "examples": { "en": [ - { "text": "unplug the hair dryer after using it", "source": "omw" } + { + "text": "unplug the hair dryer after using it", + "source": "omw" + } ], "fr": [ { @@ -1687,8 +3059,16 @@ ] }, "votes": { - "en": { "unplug": { "cefr_source": "A2" } }, - "fr": { "débrancher": { "cefr_source": "A2" } } + "en": { + "unplug": { + "cefr_source": "A2" + } + }, + "fr": { + "débrancher": { + "cefr_source": "A2" + } + } }, "_sample_bucket": "has_glosses_and_examples" }, @@ -1696,10 +3076,20 @@ "source_id": "ili:i85884", "pos": "noun", "translations": { - "en": ["North Sea"], - "es": ["Mar del Norte"], - "de": ["Nordsee", "Deutsches Meer"], - "fr": ["mer du Nord", "Mer du Nord"] + "en": [ + "North Sea" + ], + "es": [ + "Mar del Norte" + ], + "de": [ + "Nordsee", + "Deutsches Meer" + ], + "fr": [ + "mer du Nord", + "Mer du Nord" + ] }, "glosses": { "en": [ @@ -1711,18 +3101,31 @@ }, "examples": { "de": [ - { "text": "Wir fahren im Sommer an die Nordsee.", "source": "cefr" } + { + "text": "Wir fahren im Sommer an die Nordsee.", + "source": "cefr" + } ] }, - "votes": { "de": { "Nordsee": { "cefr_source": "A2" } } }, + "votes": { + "de": { + "Nordsee": { + "cefr_source": "A2" + } + } + }, "_sample_bucket": "no_glosses_no_examples" }, { "source_id": "ili:i57058", "pos": "noun", "translations": { - "en": ["patriarchal cross"], - "es": ["cruz patriarcal"], + "en": [ + "patriarchal cross" + ], + "es": [ + "cruz patriarcal" + ], "de": [ "Erzbischofskreuz", "Spanisches Kreuz", @@ -1732,8 +3135,12 @@ ] }, "glosses": { - "en": ["a cross with two crossbars"], - "de": ["ein Kreuz mit zwei Querbalken"] + "en": [ + "a cross with two crossbars" + ], + "de": [ + "ein Kreuz mit zwei Querbalken" + ] }, "examples": {}, "votes": {}, @@ -1743,10 +3150,19 @@ "source_id": "ili:i14067", "pos": "adjective", "translations": { - "en": ["maximizing", "maximising"], - "fr": ["maximaliste"] + "en": [ + "maximizing", + "maximising" + ], + "fr": [ + "maximaliste" + ] + }, + "glosses": { + "en": [ + "making as great as possible" + ] }, - "glosses": { "en": ["making as great as possible"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_glosses_no_examples" @@ -1755,14 +3171,27 @@ "source_id": "ili:i57206", "pos": "noun", "translations": { - "en": ["photocathode"], - "es": ["fotocátodo"], - "de": ["Photokathode", "Fotokathode"], - "fr": ["photocathode"] + "en": [ + "photocathode" + ], + "es": [ + "fotocátodo" + ], + "de": [ + "Photokathode", + "Fotokathode" + ], + "fr": [ + "photocathode" + ] }, "glosses": { - "en": ["a cathode that emits electrons when illuminated"], - "de": ["eine Kathode, die bei Beleuchtung Elektronen abgibt"] + "en": [ + "a cathode that emits electrons when illuminated" + ], + "de": [ + "eine Kathode, die bei Beleuchtung Elektronen abgibt" + ] }, "examples": {}, "votes": {}, @@ -1772,11 +3201,25 @@ "source_id": "ili:i97025", "pos": "noun", "translations": { - "en": ["Stockton", "Frank Stockton", "Francis Richard Stockton"], - "es": ["Francis Richard Stockton", "Frank Stockton", "Stockton"], - "fr": ["Stockton"] + "en": [ + "Stockton", + "Frank Stockton", + "Francis Richard Stockton" + ], + "es": [ + "Francis Richard Stockton", + "Frank Stockton", + "Stockton" + ], + "fr": [ + "Stockton" + ] + }, + "glosses": { + "en": [ + "United States writer (1834-1902)" + ] }, - "glosses": { "en": ["United States writer (1834-1902)"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_glosses_no_examples" @@ -1784,7 +3227,11 @@ { "source_id": "ili:i101248", "pos": "noun", - "translations": { "en": ["obeche"] }, + "translations": { + "en": [ + "obeche" + ] + }, "glosses": { "en": [ "the wood of an African obeche tree; used especially for veneering" @@ -1798,8 +3245,13 @@ "source_id": "ili:i94985", "pos": "noun", "translations": { - "en": ["Eames", "Charles Eames"], - "es": ["Charles Eames"] + "en": [ + "Eames", + "Charles Eames" + ], + "es": [ + "Charles Eames" + ] }, "glosses": { "en": [ @@ -1814,10 +3266,20 @@ "source_id": "ili:i16699", "pos": "adjective", "translations": { - "en": ["mensural", "measured", "mensurable"], - "es": ["mensural"] + "en": [ + "mensural", + "measured", + "mensurable" + ], + "es": [ + "mensural" + ] + }, + "glosses": { + "en": [ + "having notes of fixed rhythmic value" + ] }, - "glosses": { "en": ["having notes of fixed rhythmic value"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_glosses_no_examples" @@ -1826,8 +3288,13 @@ "source_id": "ili:i99999", "pos": "noun", "translations": { - "en": ["China aster", "Callistephus chinensis"], - "fr": ["callistephus chinensis"] + "en": [ + "China aster", + "Callistephus chinensis" + ], + "fr": [ + "callistephus chinensis" + ] }, "glosses": { "en": [ @@ -1841,8 +3308,19 @@ { "source_id": "ili:i75135", "pos": "noun", - "translations": { "en": ["kiss of death"], "fr": ["baiser de la mort"] }, - "glosses": { "en": ["something that is ruinous"] }, + "translations": { + "en": [ + "kiss of death" + ], + "fr": [ + "baiser de la mort" + ] + }, + "glosses": { + "en": [ + "something that is ruinous" + ] + }, "examples": { "en": [ { @@ -1857,7 +3335,11 @@ { "source_id": "ili:i36428", "pos": "noun", - "translations": { "en": ["dark adaptation"] }, + "translations": { + "en": [ + "dark adaptation" + ] + }, "glosses": { "en": [ "the process of adjusting the eyes to low levels of illumination; cones adapt first; rods continue to adapt for up to four hours" @@ -1871,10 +3353,16 @@ "source_id": "ili:i103092", "pos": "noun", "translations": { - "en": ["saw palmetto", "scrub palmetto", "Serenoa repens"] + "en": [ + "saw palmetto", + "scrub palmetto", + "Serenoa repens" + ] }, "glosses": { - "en": ["small hardy clump-forming spiny palm of southern United States"] + "en": [ + "small hardy clump-forming spiny palm of southern United States" + ] }, "examples": {}, "votes": {}, @@ -1883,8 +3371,16 @@ { "source_id": "ili:i14834", "pos": "adjective", - "translations": { "en": ["zoic"] }, - "glosses": { "en": ["pertaining to animals or animal life or action"] }, + "translations": { + "en": [ + "zoic" + ] + }, + "glosses": { + "en": [ + "pertaining to animals or animal life or action" + ] + }, "examples": {}, "votes": {}, "_sample_bucket": "no_glosses_no_examples" @@ -1892,8 +3388,19 @@ { "source_id": "ili:i25953", "pos": "verb", - "translations": { "en": ["blog"], "es": ["blogear"] }, - "glosses": { "en": ["read, write, or edit a shared on-line journal"] }, + "translations": { + "en": [ + "blog" + ], + "es": [ + "blogear" + ] + }, + "glosses": { + "en": [ + "read, write, or edit a shared on-line journal" + ] + }, "examples": {}, "votes": {}, "_sample_bucket": "no_glosses_no_examples" @@ -1901,9 +3408,27 @@ { "source_id": "ili:i24441", "pos": "verb", - "translations": { "en": ["ream"], "es": ["taladrar"] }, - "glosses": { "en": ["enlarge with a reamer"] }, - "examples": { "en": [{ "text": "ream a hole", "source": "omw" }] }, + "translations": { + "en": [ + "ream" + ], + "es": [ + "taladrar" + ] + }, + "glosses": { + "en": [ + "enlarge with a reamer" + ] + }, + "examples": { + "en": [ + { + "text": "ream a hole", + "source": "omw" + } + ] + }, "votes": {}, "_sample_bucket": "no_glosses_no_examples" }, @@ -1911,10 +3436,19 @@ "source_id": "ili:i60874", "pos": "noun", "translations": { - "en": ["virtual memory", "virtual storage"], - "it": ["memoria virtuale"], - "es": ["memoria virtual"], - "fr": ["mémoire virtuelle"] + "en": [ + "virtual memory", + "virtual storage" + ], + "it": [ + "memoria virtuale" + ], + "es": [ + "memoria virtual" + ], + "fr": [ + "mémoire virtuelle" + ] }, "glosses": { "en": [ @@ -1929,8 +3463,14 @@ "source_id": "ili:i105979", "pos": "noun", "translations": { - "en": ["Dryopteris", "genus Dryopteris"], - "fr": ["Dryopteris", "dryopteris"] + "en": [ + "Dryopteris", + "genus Dryopteris" + ], + "fr": [ + "Dryopteris", + "dryopteris" + ] }, "glosses": { "en": [ @@ -1945,10 +3485,19 @@ "source_id": "ili:i44411", "pos": "noun", "translations": { - "en": ["blue racer", "Coluber constrictor flaviventris"], - "fr": ["coluber constrictor"] + "en": [ + "blue racer", + "Coluber constrictor flaviventris" + ], + "fr": [ + "coluber constrictor" + ] + }, + "glosses": { + "en": [ + "bluish-green blacksnake found from Ohio to Texas" + ] }, - "glosses": { "en": ["bluish-green blacksnake found from Ohio to Texas"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_glosses_no_examples" @@ -1957,11 +3506,18 @@ "source_id": "ili:i14592", "pos": "adjective", "translations": { - "en": ["anagrammatic", "anagrammatical"], - "it": ["anagrammatico"] + "en": [ + "anagrammatic", + "anagrammatical" + ], + "it": [ + "anagrammatico" + ] }, "glosses": { - "en": ["related to anagrams or containing or making an anagram"] + "en": [ + "related to anagrams or containing or making an anagram" + ] }, "examples": {}, "votes": {}, @@ -1971,10 +3527,19 @@ "source_id": "ili:i5174", "pos": "adjective", "translations": { - "en": ["protrusile", "protrusible"], - "fr": ["protrusible"] + "en": [ + "protrusile", + "protrusible" + ], + "fr": [ + "protrusible" + ] + }, + "glosses": { + "en": [ + "capable of being thrust forward, as the tongue" + ] }, - "glosses": { "en": ["capable of being thrust forward, as the tongue"] }, "examples": {}, "votes": {}, "_sample_bucket": "no_glosses_no_examples" @@ -1982,8 +3547,17 @@ { "source_id": "ili:i99278", "pos": "noun", - "translations": { "en": ["pink calla", "Zantedeschia rehmanii"] }, - "glosses": { "en": ["calla having a rose-colored spathe"] }, + "translations": { + "en": [ + "pink calla", + "Zantedeschia rehmanii" + ] + }, + "glosses": { + "en": [ + "calla having a rose-colored spathe" + ] + }, "examples": {}, "votes": {}, "_sample_bucket": "pos_spread" @@ -1992,9 +3566,16 @@ "source_id": "ili:i97983", "pos": "noun", "translations": { - "en": ["phosphorescence"], - "it": ["fosforescenza", "fotoluminescenza"], - "fr": ["phosphorescence"] + "en": [ + "phosphorescence" + ], + "it": [ + "fosforescenza", + "fotoluminescenza" + ], + "fr": [ + "phosphorescence" + ] }, "glosses": { "en": [ @@ -2008,9 +3589,16 @@ { "source_id": "ili:i54194", "pos": "noun", - "translations": { "en": ["garrison cap", "overseas cap"] }, + "translations": { + "en": [ + "garrison cap", + "overseas cap" + ] + }, "glosses": { - "en": ["a wedge-shaped wool or cotton cap; worn as part of a uniform"] + "en": [ + "a wedge-shaped wool or cotton cap; worn as part of a uniform" + ] }, "examples": {}, "votes": {}, @@ -2019,8 +3607,20 @@ { "source_id": "ili:i102972", "pos": "noun", - "translations": { "en": ["Tipuana", "genus Tipuana"], "fr": ["tipuana"] }, - "glosses": { "en": ["one species: South American tree: tipu tree"] }, + "translations": { + "en": [ + "Tipuana", + "genus Tipuana" + ], + "fr": [ + "tipuana" + ] + }, + "glosses": { + "en": [ + "one species: South American tree: tipu tree" + ] + }, "examples": {}, "votes": {}, "_sample_bucket": "pos_spread" @@ -2028,18 +3628,38 @@ { "source_id": "ili:i55386", "pos": "noun", - "translations": { "en": ["king"], "fr": ["roi"] }, + "translations": { + "en": [ + "king" + ], + "fr": [ + "roi" + ] + }, "glosses": { "en": [ "a checker that has been moved to the opponent's first row where it is promoted to a piece that is free to move either forward or backward" ] }, "examples": { - "fr": [{ "text": "Le roi a visité la ville.", "source": "cefr" }] + "fr": [ + { + "text": "Le roi a visité la ville.", + "source": "cefr" + } + ] }, "votes": { - "en": { "king": { "cefr_source": "A2" } }, - "fr": { "roi": { "cefr_source": "B1" } } + "en": { + "king": { + "cefr_source": "A2" + } + }, + "fr": { + "roi": { + "cefr_source": "B1" + } + } }, "_sample_bucket": "pos_spread" }, @@ -2047,19 +3667,47 @@ "source_id": "ili:i26482", "pos": "verb", "translations": { - "en": ["articulate", "enunciate", "vocalize", "vocalise"], - "it": ["articolare", "enunciare", "enunziare", "scandire"], - "es": ["articular"], - "de": ["ausdrücken", "artikulieren"], - "fr": ["articuler", "exprimer", "énoncer", "formuler", "vocaliser"] + "en": [ + "articulate", + "enunciate", + "vocalize", + "vocalise" + ], + "it": [ + "articolare", + "enunciare", + "enunziare", + "scandire" + ], + "es": [ + "articular" + ], + "de": [ + "ausdrücken", + "artikulieren" + ], + "fr": [ + "articuler", + "exprimer", + "énoncer", + "formuler", + "vocaliser" + ] }, "glosses": { - "en": ["express or state clearly"], - "de": ["klar ausdrücken oder erklären"] + "en": [ + "express or state clearly" + ], + "de": [ + "klar ausdrücken oder erklären" + ] }, "examples": { "it": [ - { "text": "È importante articolare bene le parole.", "source": "cefr" } + { + "text": "È importante articolare bene le parole.", + "source": "cefr" + } ], "de": [ { @@ -2097,44 +3745,105 @@ ] }, "votes": { - "en": { "articulate": { "cefr_source": "B2" } }, - "it": { "articolare": { "cefr_source": "B2" } }, + "en": { + "articulate": { + "cefr_source": "B2" + } + }, + "it": { + "articolare": { + "cefr_source": "B2" + } + }, "de": { - "ausdrücken": { "cefr_source": "B1" }, - "artikulieren": { "cefr_source": "B2" } + "ausdrücken": { + "cefr_source": "B1" + }, + "artikulieren": { + "cefr_source": "B2" + } }, "fr": { - "articuler": { "cefr_source": "B1" }, - "exprimer": { "cefr_source": "B1" }, - "énoncer": { "cefr_source": "B2" }, - "formuler": { "cefr_source": "B2" } + "articuler": { + "cefr_source": "B1" + }, + "exprimer": { + "cefr_source": "B1" + }, + "énoncer": { + "cefr_source": "B2" + }, + "formuler": { + "cefr_source": "B2" + } }, - "es": { "articular": { "cefr_source": "B2" } } + "es": { + "articular": { + "cefr_source": "B2" + } + } }, "_sample_bucket": "pos_spread" }, { "source_id": "ili:i22492", "pos": "verb", - "translations": { "en": ["spike"] }, - "glosses": { "en": ["manifest a sharp increase"] }, - "examples": { "en": [{ "text": "the voltage spiked", "source": "omw" }] }, + "translations": { + "en": [ + "spike" + ] + }, + "glosses": { + "en": [ + "manifest a sharp increase" + ] + }, + "examples": { + "en": [ + { + "text": "the voltage spiked", + "source": "omw" + } + ] + }, "votes": {}, "_sample_bucket": "pos_spread" }, { "source_id": "ili:i26383", "pos": "verb", - "translations": { "en": ["redefine"], "fr": ["redéfinir"] }, - "glosses": { "en": ["give a new or different definition of (a word)"] }, + "translations": { + "en": [ + "redefine" + ], + "fr": [ + "redéfinir" + ] + }, + "glosses": { + "en": [ + "give a new or different definition of (a word)" + ] + }, "examples": { "fr": [ - { "text": "Il est temps de redéfinir nos objectifs.", "source": "cefr" } + { + "text": "Il est temps de redéfinir nos objectifs.", + "source": "cefr" + } ] }, "votes": { - "en": { "redefine": { "cefr_source": "B2" } }, - "fr": { "redéfinir": { "cefr_source": "B2" } } + "en": { + "redefine": { + "cefr_source": "B2" + } + }, + "fr": { + "redéfinir": { + "cefr_source": "B2" + } + } }, "_sample_bucket": "pos_spread" }, @@ -2142,8 +3851,15 @@ "source_id": "ili:i22943", "pos": "verb", "translations": { - "en": ["slake", "abate", "slack"], - "es": ["aflojar", "reducir"], + "en": [ + "slake", + "abate", + "slack" + ], + "es": [ + "aflojar", + "reducir" + ], "fr": [ "descendre", "cesser", @@ -2154,25 +3870,47 @@ "supprimer" ] }, - "glosses": { "en": ["make less active or intense"] }, + "glosses": { + "en": [ + "make less active or intense" + ] + }, "examples": { "fr": [ { "text": "Nous allons descendre au rez-de-chaussée.", "source": "cefr" }, - { "text": "La pluie a cessé de tomber.", "source": "cefr" }, - { "text": "Nous devons réduire nos dépenses.", "source": "cefr" }, - { "text": "Il faut ralentir avant le virage.", "source": "cefr" }, + { + "text": "La pluie a cessé de tomber.", + "source": "cefr" + }, + { + "text": "Nous devons réduire nos dépenses.", + "source": "cefr" + }, + { + "text": "Il faut ralentir avant le virage.", + "source": "cefr" + }, { "text": "Ces mesures visent à amoindrir l'impact de la crise.", "source": "cefr" }, - { "text": "Les prix ont commencé à diminuer.", "source": "cefr" }, - { "text": "Il faut supprimer les fichiers inutiles.", "source": "cefr" } + { + "text": "Les prix ont commencé à diminuer.", + "source": "cefr" + }, + { + "text": "Il faut supprimer les fichiers inutiles.", + "source": "cefr" + } ], "es": [ - { "text": "Tienes que aflojar el nudo.", "source": "cefr" }, + { + "text": "Tienes que aflojar el nudo.", + "source": "cefr" + }, { "text": "Necesitamos reducir el consumo de energía.", "source": "cefr" @@ -2180,19 +3918,41 @@ ] }, "votes": { - "en": { "abate": { "cefr_source": "C1" } }, + "en": { + "abate": { + "cefr_source": "C1" + } + }, "fr": { - "descendre": { "cefr_source": "A2" }, - "cesser": { "cefr_source": "B1" }, - "réduire": { "cefr_source": "B1" }, - "ralentir": { "cefr_source": "B1" }, - "amoindrir": { "cefr_source": "C1" }, - "diminuer": { "cefr_source": "B1" }, - "supprimer": { "cefr_source": "B2" } + "descendre": { + "cefr_source": "A2" + }, + "cesser": { + "cefr_source": "B1" + }, + "réduire": { + "cefr_source": "B1" + }, + "ralentir": { + "cefr_source": "B1" + }, + "amoindrir": { + "cefr_source": "C1" + }, + "diminuer": { + "cefr_source": "B1" + }, + "supprimer": { + "cefr_source": "B2" + } }, "es": { - "aflojar": { "cefr_source": "B1" }, - "reducir": { "cefr_source": "B1" } + "aflojar": { + "cefr_source": "B1" + }, + "reducir": { + "cefr_source": "B1" + } } }, "_sample_bucket": "pos_spread" @@ -2200,22 +3960,50 @@ { "source_id": "ili:i31348", "pos": "verb", - "translations": { "en": ["romp"] }, - "glosses": { "en": ["run easily and fairly fast"] }, + "translations": { + "en": [ + "romp" + ] + }, + "glosses": { + "en": [ + "run easily and fairly fast" + ] + }, "examples": {}, - "votes": { "en": { "romp": { "cefr_source": "B2" } } }, + "votes": { + "en": { + "romp": { + "cefr_source": "B2" + } + } + }, "_sample_bucket": "pos_spread" }, { "source_id": "ili:i10413", "pos": "adjective", "translations": { - "en": ["imprudent"], - "it": ["imprudente", "incauto"], - "es": ["imprudente", "insensato"], - "fr": ["imprudent"] + "en": [ + "imprudent" + ], + "it": [ + "imprudente", + "incauto" + ], + "es": [ + "imprudente", + "insensato" + ], + "fr": [ + "imprudent" + ] + }, + "glosses": { + "en": [ + "not prudent or wise" + ] }, - "glosses": { "en": ["not prudent or wise"] }, "examples": { "en": [ { @@ -2244,15 +4032,30 @@ "text": "Fue una decisión imprudente conducir tan rápido.", "source": "cefr" }, - { "text": "Fue una decisión insensata.", "source": "cefr" } + { + "text": "Fue una decisión insensata.", + "source": "cefr" + } ] }, "votes": { - "it": { "imprudente": { "cefr_source": "B2" } }, - "fr": { "imprudent": { "cefr_source": "B2" } }, + "it": { + "imprudente": { + "cefr_source": "B2" + } + }, + "fr": { + "imprudent": { + "cefr_source": "B2" + } + }, "es": { - "imprudente": { "cefr_source": "B2" }, - "insensato": { "cefr_source": "B2" } + "imprudente": { + "cefr_source": "B2" + }, + "insensato": { + "cefr_source": "B2" + } } }, "_sample_bucket": "pos_spread" @@ -2261,13 +4064,36 @@ "source_id": "ili:i8645", "pos": "adjective", "translations": { - "en": ["metaphysical"], - "es": ["metafísico"], - "fr": ["métaphysique"] + "en": [ + "metaphysical" + ], + "es": [ + "metafísico" + ], + "fr": [ + "métaphysique" + ] + }, + "glosses": { + "en": [ + "without material form or substance" + ] + }, + "examples": { + "en": [ + { + "text": "metaphysical forces", + "source": "omw" + } + ] + }, + "votes": { + "en": { + "metaphysical": { + "cefr_source": "C1" + } + } }, - "glosses": { "en": ["without material form or substance"] }, - "examples": { "en": [{ "text": "metaphysical forces", "source": "omw" }] }, - "votes": { "en": { "metaphysical": { "cefr_source": "C1" } } }, "_sample_bucket": "pos_spread" }, { @@ -2281,8 +4107,13 @@ "essential", "of the essence" ], - "it": ["essenziale"], - "es": ["crucial", "esencial"], + "it": [ + "essenziale" + ], + "es": [ + "crucial", + "esencial" + ], "de": [ "bedeutsam", "wesentlich", @@ -2293,26 +4124,52 @@ "aussagekräftig", "signifikant" ], - "fr": ["essentiel"] + "fr": [ + "essentiel" + ] }, "glosses": { - "en": ["of the greatest importance"], - "de": ["von allergrößter Bedeutung"] + "en": [ + "of the greatest importance" + ], + "de": [ + "von allergrößter Bedeutung" + ] }, "examples": { "en": [ - { "text": "the all-important subject of disarmament", "source": "omw" }, - { "text": "crucial information", "source": "omw" }, - { "text": "in chess cool nerves are of the essence", "source": "omw" } + { + "text": "the all-important subject of disarmament", + "source": "omw" + }, + { + "text": "crucial information", + "source": "omw" + }, + { + "text": "in chess cool nerves are of the essence", + "source": "omw" + } + ], + "it": [ + { + "text": "L'acqua è essenziale per la vita.", + "source": "cefr" + } ], - "it": [{ "text": "L'acqua è essenziale per la vita.", "source": "cefr" }], "de": [ { "text": "Das war ein bedeutsamer Moment in der Geschichte.", "source": "cefr" }, - { "text": "Das ist ein wesentlicher Unterschied.", "source": "cefr" }, - { "text": "Das ist eine wichtige Information.", "source": "cefr" }, + { + "text": "Das ist ein wesentlicher Unterschied.", + "source": "cefr" + }, + { + "text": "Das ist eine wichtige Information.", + "source": "cefr" + }, { "text": "Er formulierte seine Gedanken sehr prägnant.", "source": "cefr" @@ -2321,7 +4178,10 @@ "text": "Die Studie lieferte aussagekräftige Ergebnisse.", "source": "cefr" }, - { "text": "Es gab eine signifikante Veränderung.", "source": "cefr" } + { + "text": "Es gab eine signifikante Veränderung.", + "source": "cefr" + } ], "fr": [ { @@ -2330,28 +4190,62 @@ } ], "es": [ - { "text": "Es crucial que lleguemos a tiempo.", "source": "cefr" }, - { "text": "El agua es esencial para la vida.", "source": "cefr" } + { + "text": "Es crucial que lleguemos a tiempo.", + "source": "cefr" + }, + { + "text": "El agua es esencial para la vida.", + "source": "cefr" + } ] }, "votes": { "en": { - "crucial": { "cefr_source": "B2" }, - "essential": { "cefr_source": "B1" } + "crucial": { + "cefr_source": "B2" + }, + "essential": { + "cefr_source": "B1" + } + }, + "it": { + "essenziale": { + "cefr_source": "B1" + } }, - "it": { "essenziale": { "cefr_source": "B1" } }, "de": { - "bedeutsam": { "cefr_source": "B2" }, - "wesentlich": { "cefr_source": "B1" }, - "wichtig": { "cefr_source": "A1" }, - "prägnant": { "cefr_source": "B2" }, - "aussagekräftig": { "cefr_source": "B2" }, - "signifikant": { "cefr_source": "C1" } + "bedeutsam": { + "cefr_source": "B2" + }, + "wesentlich": { + "cefr_source": "B1" + }, + "wichtig": { + "cefr_source": "A1" + }, + "prägnant": { + "cefr_source": "B2" + }, + "aussagekräftig": { + "cefr_source": "B2" + }, + "signifikant": { + "cefr_source": "C1" + } + }, + "fr": { + "essentiel": { + "cefr_source": "B1" + } }, - "fr": { "essentiel": { "cefr_source": "B1" } }, "es": { - "crucial": { "cefr_source": "B2" }, - "esencial": { "cefr_source": "B1" } + "crucial": { + "cefr_source": "B2" + }, + "esencial": { + "cefr_source": "B1" + } } }, "_sample_bucket": "pos_spread" @@ -2359,9 +4253,24 @@ { "source_id": "ili:i13690", "pos": "adjective", - "translations": { "en": ["round-arm"] }, - "glosses": { "en": ["with the arm swung round at shoulder height"] }, - "examples": { "en": [{ "text": "round-arm bowling", "source": "omw" }] }, + "translations": { + "en": [ + "round-arm" + ] + }, + "glosses": { + "en": [ + "with the arm swung round at shoulder height" + ] + }, + "examples": { + "en": [ + { + "text": "round-arm bowling", + "source": "omw" + } + ] + }, "votes": {}, "_sample_bucket": "pos_spread" }, @@ -2369,53 +4278,134 @@ "source_id": "ili:i16993", "pos": "adjective", "translations": { - "en": ["Monacan", "Monegasque"], - "it": ["monegasco"], - "fr": ["monégasque"] + "en": [ + "Monacan", + "Monegasque" + ], + "it": [ + "monegasco" + ], + "fr": [ + "monégasque" + ] }, "glosses": { - "en": ["of or relating to or characteristic of Monaco or its people"] + "en": [ + "of or relating to or characteristic of Monaco or its people" + ] }, "examples": { - "fr": [{ "text": "Il est de nationalité monégasque.", "source": "cefr" }] + "fr": [ + { + "text": "Il est de nationalité monégasque.", + "source": "cefr" + } + ] + }, + "votes": { + "fr": { + "monégasque": { + "cefr_source": "B1" + } + } }, - "votes": { "fr": { "monégasque": { "cefr_source": "B1" } } }, "_sample_bucket": "pos_spread" }, { "source_id": "ili:i18824", "pos": "adverb", "translations": { - "en": ["here", "hither"], - "it": ["qua", "qui"], - "fr": ["ici", "çà", "par ici"] - }, - "glosses": { "en": ["to this place (especially toward the speaker)"] }, - "examples": { - "en": [{ "text": "come here, please", "source": "omw" }], - "it": [ - { "text": "Vieni qua, per favore.", "source": "cefr" }, - { "text": "Vieni qui!", "source": "cefr" } + "en": [ + "here", + "hither" ], - "fr": [{ "text": "Venez ici !", "source": "cefr" }] + "it": [ + "qua", + "qui" + ], + "fr": [ + "ici", + "çà", + "par ici" + ] + }, + "glosses": { + "en": [ + "to this place (especially toward the speaker)" + ] + }, + "examples": { + "en": [ + { + "text": "come here, please", + "source": "omw" + } + ], + "it": [ + { + "text": "Vieni qua, per favore.", + "source": "cefr" + }, + { + "text": "Vieni qui!", + "source": "cefr" + } + ], + "fr": [ + { + "text": "Venez ici !", + "source": "cefr" + } + ] }, "votes": { "en": { - "here": { "cefr_source": "A1" }, - "hither": { "cefr_source": "C2" } + "here": { + "cefr_source": "A1" + }, + "hither": { + "cefr_source": "C2" + } }, - "it": { "qua": { "cefr_source": "A1" }, "qui": { "cefr_source": "A1" } }, - "fr": { "ici": { "cefr_source": "A1" } } + "it": { + "qua": { + "cefr_source": "A1" + }, + "qui": { + "cefr_source": "A1" + } + }, + "fr": { + "ici": { + "cefr_source": "A1" + } + } }, "_sample_bucket": "pos_spread" }, { "source_id": "ili:i19641", "pos": "adverb", - "translations": { "en": ["head-on"], "es": ["de frente"] }, - "glosses": { "en": ["with the front foremost"] }, + "translations": { + "en": [ + "head-on" + ], + "es": [ + "de frente" + ] + }, + "glosses": { + "en": [ + "with the front foremost" + ] + }, "examples": { - "en": [{ "text": "the cars collided head-on", "source": "omw" }] + "en": [ + { + "text": "the cars collided head-on", + "source": "omw" + } + ] }, "votes": {}, "_sample_bucket": "pos_spread" @@ -2423,8 +4413,16 @@ { "source_id": "ili:i21417", "pos": "adverb", - "translations": { "en": ["sweepingly"] }, - "glosses": { "en": ["in a sweeping manner"] }, + "translations": { + "en": [ + "sweepingly" + ] + }, + "glosses": { + "en": [ + "in a sweeping manner" + ] + }, "examples": { "en": [ { @@ -2440,14 +4438,28 @@ "source_id": "ili:i20131", "pos": "adverb", "translations": { - "en": ["gallantly", "chivalrously"], - "it": ["galantemente"], - "fr": ["chevaleresquement"] + "en": [ + "gallantly", + "chivalrously" + ], + "it": [ + "galantemente" + ], + "fr": [ + "chevaleresquement" + ] + }, + "glosses": { + "en": [ + "in a gallant manner" + ] }, - "glosses": { "en": ["in a gallant manner"] }, "examples": { "en": [ - { "text": "he gallantly offered to take her home", "source": "omw" } + { + "text": "he gallantly offered to take her home", + "source": "omw" + } ] }, "votes": {}, @@ -2456,8 +4468,16 @@ { "source_id": "ili:i20516", "pos": "adverb", - "translations": { "en": ["fractiously"] }, - "glosses": { "en": ["in a fractious manner"] }, + "translations": { + "en": [ + "fractiously" + ] + }, + "glosses": { + "en": [ + "in a fractious manner" + ] + }, "examples": { "en": [ { @@ -2469,4 +4489,4 @@ "votes": {}, "_sample_bucket": "pos_spread" } -] +] \ No newline at end of file diff --git a/data-pipeline/tsconfig.json b/data-pipeline/tsconfig.json index 7752b6c..83c3053 100644 --- a/data-pipeline/tsconfig.json +++ b/data-pipeline/tsconfig.json @@ -5,8 +5,8 @@ "moduleResolution": "NodeNext", "outDir": "dist", "rootDir": ".", - "types": ["node"] + "types": ["node"], }, "references": [{ "path": "../packages/shared" }], - "include": ["./**/*"] + "include": ["./**/*"], } diff --git a/docker-compose.yml b/docker-compose.yml index cae960a..b661975 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,6 @@ services: api: container_name: lila-api - user: "${UID}:${GID}" build: context: . dockerfile: ./apps/api/Dockerfile @@ -60,7 +59,6 @@ services: web: container_name: lila-web - user: "${UID}:${GID}" build: context: . dockerfile: ./apps/web/Dockerfile diff --git a/documentation/data-pipeline.md b/documentation/PIPELINE.md similarity index 89% rename from documentation/data-pipeline.md rename to documentation/PIPELINE.md index 4d1bbc7..56285b9 100644 --- a/documentation/data-pipeline.md +++ b/documentation/PIPELINE.md @@ -55,13 +55,13 @@ See **Setup** for download instructions. Per-language JSON files in `sources/cefr/` provide the initial CEFR level annotations. These files do not cover the full vocabulary extracted from OMW — coverage varies by language. Gaps and disagreements are handled by the enrich stage. -| Language | File | -| -------- | ---------------------- | -| English | `sources/cefr/en.json` | -| Italian | `sources/cefr/it.json` | -| Spanish | `sources/cefr/es.json` | -| German | `sources/cefr/de.json` | -| French | `sources/cefr/fr.json` | +| Language | File | +|---|---| +| English | `sources/cefr/en.json` | +| Italian | `sources/cefr/it.json` | +| Spanish | `sources/cefr/es.json` | +| German | `sources/cefr/de.json` | +| French | `sources/cefr/fr.json` | These files are committed to git. For per-language coverage detail see `COVERAGE.md`. @@ -102,13 +102,13 @@ See `LLM-SETUP.md`. The pipeline runs in five stages. Each stage is independent and can be re-run without affecting the others. -| Stage | What it does | -| ----------- | -------------------------------------------------------------------- | -| 1. Extract | Reads OMW SQLite database, outputs normalized JSON per language | +| Stage | What it does | +|---|---| +| 1. Extract | Reads OMW SQLite database, outputs normalized JSON per language | | 2. Annotate | Merges CEFR source files into extracted data, adds source file votes | -| 3. Enrich | Runs local LLMs in two rounds — generation then voting | -| 4. Merge | Resolves votes, derives difficulty, splits into final and flagged | -| 5. Compare | Generates COVERAGE.md with detailed quality report | +| 3. Enrich | Runs local LLMs in two rounds — generation then voting | +| 4. Merge | Resolves votes, derives difficulty, splits into final and flagged | +| 5. Compare | Generates COVERAGE.md with detailed quality report | ### 1. Extract @@ -137,11 +137,11 @@ Each record in the output looks like this: "fr": ["comptable"] }, "glosses": { - "en": [ - "(usually followed by 'to') having the necessary means or skill or know-how or authority to do something" - ] + "en": ["(usually followed by 'to') having the necessary means or skill or know-how or authority to do something"] }, - "examples": { "en": ["able to swim", "she was able to program her computer"] } + "examples": { + "en": ["able to swim", "she was able to program her computer"] + } } ``` @@ -158,7 +158,6 @@ Words appearing in the CEFR source file multiple times with different CEFR level **Input:** `stage-1-extract/output/omw.json` + `stage-2-annotate/sources/cefr/{lang}.json` **Output:** - - `stage-2-annotate/output/{lang}.json` — one per language - `stage-2-annotate/output/conflicts.json` — cross-language conflicts for review @@ -178,14 +177,20 @@ Each record in the output extends the OMW record with a `votes` field and any ad "es": ["capaz"], "fr": ["comptable"] }, - "glosses": { "en": ["having the necessary means or skill to do something"] }, + "glosses": { + "en": ["having the necessary means or skill to do something"] + }, "examples": { "en": [ { "text": "able to swim", "source": "omw" }, { "text": "She was able to finish the task.", "source": "cefr" } ] }, - "votes": { "en": { "able": { "cefr_source": "B1" } } } + "votes": { + "en": { + "able": { "cefr_source": "B1" } + } + } } ``` @@ -292,7 +297,9 @@ Each record in the votes file looks like this: } }, "examples": { - "en": [{ "text": "the dog barked at the stranger", "source": "omw" }], + "en": [ + { "text": "the dog barked at the stranger", "source": "omw" } + ], "fr": { "candidates": [ { "text": "le chien a aboyé", "source": "model_1" }, @@ -304,14 +311,8 @@ Each record in the votes file looks like this: "descriptions": { "en": { "candidates": [ - { - "text": "a common household pet known for loyalty", - "source": "model_1" - }, - { - "text": "a domesticated animal and loyal companion", - "source": "model_2" - } + { "text": "a common household pet known for loyalty", "source": "model_1" }, + { "text": "a domesticated animal and loyal companion", "source": "model_2" } ], "votes": { "model_1": 2, "model_2": 1 } } @@ -333,15 +334,14 @@ Reads the votes file per language and resolves the final value for every field. **Difficulty mapping:** -| CEFR | Difficulty | -| ------ | ------------ | -| A1, A2 | easy | +| CEFR | Difficulty | +|---|---| +| A1, A2 | easy | | B1, B2 | intermediate | -| C1, C2 | hard | +| C1, C2 | hard | **Input:** `stage-3-enrich/output/votes/{lang}_votes.json` **Output:** - - `stage-4-merge/output/final/{lang}.json` — fully resolved, ready for seeding - `stage-4-merge/output/flagged/{lang}.json` — CEFR majority not reached, needs manual review before seeding @@ -360,15 +360,21 @@ Each record in `final/{lang}.json` looks like this: { "text": "dog", "cefr_level": "A1", "difficulty": "easy" }, { "text": "canine", "cefr_level": "B2", "difficulty": "intermediate" } ], - "it": [{ "text": "cane", "cefr_level": "A1", "difficulty": "easy" }] + "it": [ + { "text": "cane", "cefr_level": "A1", "difficulty": "easy" } + ] }, "glosses": { "en": { "text": "a domesticated carnivorous mammal", "source": "omw" }, "fr": { "text": "un mammifère carnivore domestiqué", "source": "model_1" } }, "examples": { - "en": [{ "text": "the dog barked at the stranger", "source": "omw" }], - "fr": [{ "text": "le chien a aboyé", "source": "model_1" }] + "en": [ + { "text": "the dog barked at the stranger", "source": "omw" } + ], + "fr": [ + { "text": "le chien a aboyé", "source": "model_1" } + ] }, "descriptions": { "en": { @@ -394,7 +400,6 @@ output quality per language. Run this after merge to verify output before seeding the database. **Input:** - - `stage-4-merge/output/final/{lang}.json` - `stage-4-merge/output/flagged/{lang}.json` @@ -431,12 +436,12 @@ pnpm --filter @lila/pipeline compare These values are defined in `packages/shared/src/constants.ts` and enforced by database check constraints. The pipeline filters out any entries that violate them. -| Constant | Values | -| --------------- | ------------------------------------- | -| Languages | `en`, `it`, `de`, `es`, `fr` | +| Constant | Values | +|---|---| +| Languages | `en`, `it`, `de`, `es`, `fr` | | Parts of speech | `noun`, `verb`, `adjective`, `adverb` | -| CEFR levels | `A1`, `A2`, `B1`, `B2`, `C1`, `C2` | -| Difficulty | `easy`, `intermediate`, `hard` | +| CEFR levels | `A1`, `A2`, `B1`, `B2`, `C1`, `C2` | +| Difficulty | `easy`, `intermediate`, `hard` | Adding a new value to any of these requires a constants update and a database migration before re-running the pipeline. See **Adding a new language** for the full steps — the same process applies for new parts of speech. diff --git a/documentation/backlog.md b/documentation/backlog.md deleted file mode 100644 index 35a5f05..0000000 --- a/documentation/backlog.md +++ /dev/null @@ -1,120 +0,0 @@ -# lila — backlog - -Labels: `[feature]` `[infra]` `[security]` `[ux]` `[debt]` - ---- - -## now - -Things that are actively in progress or should be picked up immediately. Mostly operational risk and the remaining phase 7 hardening work. - -- **Hetzner domain migration check** `[infra]` - Verify whether the lilastudy.com domain needs to be migrated following a Hetzner DNS change. Check Hetzner dashboard for any pending migration notice. - ---- - -## next - -Clearly planned work, not yet started. No hard ordering — sequence based on what unblocks real users first. - -- **Batch distractor queries to eliminate N+1** `[debt]` - createGameSession calls getDistractors once per term in parallel — 3 queries for 3 rounds, 10 for 10. Each query does ORDER BY RANDOM() which can't use an index and gets slower as the translations table grows. Fix: add a getDistractorsForTerms(termIds[], ...) function to @lila/db that batches all distractor fetches into a single query and returns results grouped by term. The service distributes the results per question. Prerequisite: none. Blocked by: nothing, but coordinate with any ongoing @lila/db changes. - -- **Atomic session creation** `[debt]` - createGameSession reads from Postgres (getGameTerms, getDistractors) then writes to the session store (in-memory/Valkey). A crash between the two leaves the terms consumed with no session created — the user gets an error and retries, no data is corrupted, but the work is wasted. A true transaction boundary isn't achievable across two different systems (Postgres + Valkey have no shared coordinator). Options when revisiting: store sessions in Postgres instead of Valkey (full transactionality, higher latency), or accept the current behaviour and add retry logic on the client. Revisit after Valkey is in production and actual failure rates are observable. - -- **Guest / try-now flow** `[feature]` - Allow users to play a quiz without signing in so they can see what the app offers before creating an account. Make auth middleware optional on game routes, add a "Try without account" button on the landing/login page. - -- **Favicon, page titles, Open Graph meta** `[ux]` - Add favicon, set proper per-route page titles, add Open Graph meta tags for link previews. - -- **Accessibility pass** `[ux]` - Keyboard navigation for quiz buttons, ARIA labels on interactive elements, focus management during quiz flow. - -- **Monitoring and logging** `[infra]` - Uptime monitoring and centralized logging on the VPS. Options: `chkrootkit`/`rkhunter` for security, `logwatch`/`monit` for daily summaries. - -- **Offsite backup storage** `[infra]` - Database backups currently live on the same VPS. Add offsite copies to Hetzner Object Storage or an S3-compatible service to protect against VPS failure. - -- **Valkey for game session store** `[infra]` - Add Valkey to the production Docker stack. Implement `ValkeyGameSessionStore` against the existing `GameSessionStore` interface. Required before multiplayer scales. - NOTE: the rate limiting middleware needs to be adjusted for valkey, see todo comment - -- **User stats endpoint + profile page** `[feature]` - `GET /users/me/stats` returning games played, score history, etc. Frontend profile page displaying the stats. - -- **Admin dashboard** `[feature]` - User management, overview of words and languages, and per-term stats. Not urgent but has real operational value once real users are present. - -- **Email + password login** `[feature]` - Traditional email/password auth as an alternative to social login. Configure via Better Auth. - -- **Apple login** `[feature]` - Add Apple as a social login option via Better Auth. Requires Apple Developer account and Sign in with Apple configuration. - -- **Graceful WS reconnect** `[infra]` - Handle WebSocket disconnections gracefully. Reconnect with exponential back-off. Restore game state on reconnection if a game is still in progress. - -- **Configurable game settings in multiplayer lobby** `[feature]` - Game settings (mode, round count, timer duration, target score) are currently hardcoded. The host should be able to configure these when creating a lobby. Settings should be stored in the settings jsonb column on the lobbies table and passed through to the game service at start. - -- **Tighten CSP to remove unsafe-inline** `[security]` - Current script-src uses 'unsafe-inline' to accommodate framework-injected inline scripts (likely TanStack Router hydration). Tightening this would require nonce-based CSP, which needs server-rendered HTML or a Caddy layer that injects per-request nonces. Not urgent — pragmatic CSP with 'unsafe-inline' is mainstream for SPAs at this scale. Revisit if the app handles more sensitive data or grows a meaningful user base - -- **Publish Google OAuth consent screen** `[infra]` - App is currently in testing mode, which caps OAuth sign-ins at 100 users. Before hitting that limit, publish the consent screen in Google Cloud Console. Basic scopes (email, profile, openid) require no Google review — just fill in branding fields (app name, logo, support email, privacy policy URL) and click publish. Trigger: do this before reaching 80 users. - ---- - -## later - -Directionally right, timing is unclear. Revisit when the next/now work is done. - -- **Game modes** `[feature]` - Five modes are designed in `game_modes.md` — TV Quiz Show, Race to the Top, Chain Link, Elimination Round, Cooperative Challenge. The lobby infrastructure is mode-agnostic; each mode adds game logic only. First mode to implement is TBD. This is effectively a new phase. - -- **Single Player Extended** `[feature]` - Expanded singleplayer flow. Possible directions: longer sessions with increasing difficulty, streak bonuses, mixed POS/language rounds, progress tracking across sessions, timed challenge mode. - -- **Users in a separate database** `[infra]` - Architectural separation of auth/user data from vocabulary and game data. No immediate benefit — revisit after hardening is complete and user growth justifies the complexity. - -- **Modern env management** `[debt]` - Replace `.env` files with a more robust approach (e.g. `dotenvx`, `infisical`). Current setup works but is error-prone and not versioned. - -- **Reorganize datafiles and wordlists** `[debt]` - The current layout of `data-sources/`, `scripts/datafiles/`, `scripts/data-sources/`, and `packages/db/src/data/` is confusing with overlapping content. Consolidate into a clear structure. - -- **Resolve eslint peer dependency warning** `[debt]` - `eslint-plugin-react-hooks 7.0.1` expects `eslint ^3.0.0–^9.0.0` but found `10.0.3`. Low impact but worth cleaning up when nearby. - -- **OpenAPI documentation for REST endpoints** `[feature]` - Document the API surface using OpenAPI/Swagger. Covers all REST endpoints with request/response shapes. Useful groundwork for the admin dashboard and any future contributors. - -- **Frontend tests** `[debt]` - component tests for QuestionCard, OptionButton, ScoreScreen; consider Playwright or Vitest browser mode for e2e - ---- - -## changelog - -Shipped milestones, newest first. - -- **04 - 2026 - husky + lint-staged + CI quality gate** - Pre-commit formatting, pre-push tests, and CI lint/typecheck/test gate before every deploy. -- **04 - 2026 - t00001 - Docker credential helper** -- **04 - 2026 - Pin dependencies in package.json** - Unpinned deps in a CI/CD pipeline are a real risk. -- **04 - 2026 - React error boundaries** - Catch and display runtime errors gracefully instead of crashing the entire app. -- **04 - 2026 - 404 and redirect handling** - Unknown routes return raw errors. Add a catch-all route on the frontend for client-side 404s. -- **04 - 2026 - Multiplayer GameService unit tests** - round evaluation, scoring, tie-breaking, timeout handling -- **04 - 2026 - Security headers with helmet** - Add helmet middleware to set secure HTTP response headers. -- **04 - 2026 - Rate limiting on API endpoints** - At minimum: auth endpoints (brute force prevention) and game endpoints (spam prevention) -- **04 - 2026 — Migrations in deploy pipeline** — Drizzle migrate runs as a CI/CD step before the API container restarts -- **04 - 2026 — Phase 6: Production deployment** — Hetzner VPS, Caddy HTTPS, Forgejo CI/CD, daily DB backups, cross-subdomain auth -- **04 - 2026 — Phase 5: Multiplayer game** — real-time simultaneous play, 15s server timer, live scoring, winner screen -- **04 - 2026 — Phase 4: Multiplayer lobby** — WebSocket server, lobby create/join, real-time player list -- **04 - 2026 — Phase 3: Auth** — Better Auth, Google + GitHub social login, session middleware, auth guard -- **04 - 2026 — Phase 2: Singleplayer UI** — full quiz loop in browser, game setup, question card, score screen -- **04 - 2026 — Phase 1: Vocabulary data + API** — WordNet/OMW data pipeline, CEFR enrichment, game session endpoints -- **04 - 2026 — Phase 0: Foundation** — pnpm monorepo, TypeScript, ESLint, Vitest, Drizzle, Docker Compose diff --git a/documentation/deployment.md b/documentation/deployment.md index 66d97e8..afc4d8b 100644 --- a/documentation/deployment.md +++ b/documentation/deployment.md @@ -144,7 +144,6 @@ docker system prune -a # aggressive — removes all unused images ### API (`apps/api/Dockerfile`) Multi-stage build: base → deps → dev → builder → runner. The `runner` stage does a fresh `pnpm install --prod` to get correct symlinks. Output is at `apps/api/dist/src/server.js` due to monorepo rootDir configuration. -The runner stage copies compiled migration files from the builder (packages/db/drizzle) alongside the application code. The container entrypoint runs migrate.js first, then starts server.js, ensuring schema and code are always in sync on every deploy. ### Frontend (`apps/web/Dockerfile`) @@ -175,7 +174,12 @@ The seeding script (`packages/db/src/seeding-datafiles.ts`) uses `onConflictDoNo ### Schema Migrations -Migrations are run automatically on container startup via the CMD in the API Dockerfile. The entrypoint runs migrate.js before starting the server, so the schema is always up to date before the API begins accepting requests. The correct deploy order is enforced automatically. +Schema changes are managed by Drizzle. Deploy order matters: + +1. Run migration first (database gets new structure) +2. Deploy new API image (code uses new structure) + +Reversing this order causes the API to crash on missing columns/tables. ## Backups @@ -243,13 +247,13 @@ Automated build and deploy via Forgejo Actions. On every push to `main`, the pip ### Secrets (stored in Forgejo repo settings → Actions → Secrets) -| Secret | Value | -| ----------------- | ----------------------------------------- | -| REGISTRY_USER | Forgejo username | -| REGISTRY_PASSWORD | Forgejo password | -| SSH_PRIVATE_KEY | Contents of `~/.ssh/ci-runner` on the VPS | -| SSH_HOST | VPS IP address | -| SSH_USER | `lila` | +| Secret | Value | +|---|---| +| REGISTRY_USER | Forgejo username | +| REGISTRY_PASSWORD | Forgejo password | +| SSH_PRIVATE_KEY | Contents of `~/.ssh/ci-runner` on the VPS | +| SSH_HOST | VPS IP address | +| SSH_USER | `lila` | ### Runner Configuration diff --git a/documentation/llm-setup.md b/documentation/llm-setup.md index 23a2ba8..6cc1f91 100644 --- a/documentation/llm-setup.md +++ b/documentation/llm-setup.md @@ -9,12 +9,12 @@ and production scripts. ## Hardware (dev machine) -| Component | Spec | -| --------- | --------------------------------------------------------------- | -| CPU | Intel Core i7-6500U (2 cores / 4 threads @ 3.10 GHz) | -| RAM | 8 GB | -| GPU | NVIDIA GeForce GTX 950M — 4 GB VRAM (Maxwell, CUDA compute 5.0) | -| OS | Debian GNU/Linux 13 (trixie) x86_64 | +| Component | Spec | +|---|---| +| CPU | Intel Core i7-6500U (2 cores / 4 threads @ 3.10 GHz) | +| RAM | 8 GB | +| GPU | NVIDIA GeForce GTX 950M — 4 GB VRAM (Maxwell, CUDA compute 5.0) | +| OS | Debian GNU/Linux 13 (trixie) x86_64 | **Local inference verdict:** viable for small/quantized models, not for production runs. See the [Local inference](#local-inference-llamacpp) section @@ -28,12 +28,12 @@ The enrich script uses a single, swappable provider config. All providers except Anthropic expose an OpenAI-compatible API, so the same client code works across all of them — only `baseURL`, `apiKey`, and `model` change. -| Provider | Use case | Cost | Rate limits | -| ---------------------- | --------------------------------------------- | ------------------ | ---------------------- | -| llama.cpp (local) | Quality testing, overnight dev runs | Free (electricity) | None | -| OpenRouter (free tier) | Quality comparison, multi-model evaluation | Free | 50 req/day, 20 req/min | -| OpenRouter (paid) | Production runs if local quality insufficient | Pay-per-token | None | -| Anthropic API | Quality baseline / reference | Pay-per-token | Standard | +| Provider | Use case | Cost | Rate limits | +|---|---|---|---| +| llama.cpp (local) | Quality testing, overnight dev runs | Free (electricity) | None | +| OpenRouter (free tier) | Quality comparison, multi-model evaluation | Free | 50 req/day, 20 req/min | +| OpenRouter (paid) | Production runs if local quality insufficient | Pay-per-token | None | +| Anthropic API | Quality baseline / reference | Pay-per-token | Standard | --- @@ -58,12 +58,12 @@ in hybrid mode, slower than full-GPU but much faster than pure CPU. Practical estimates for this hardware (~3.5 GB VRAM usable after drivers): -| Model size | Q4 VRAM | Mode | Est. speed | -| ---------- | ------- | ----------------------------- | ------------ | -| 3B | ~2.0 GB | Full GPU | ~15–20 tok/s | -| 4B | ~2.5 GB | Full GPU | ~12–18 tok/s | -| 7B | ~4.5 GB | Hybrid (~26/32 layers on GPU) | ~8–12 tok/s | -| 13B+ | ~8 GB+ | CPU-heavy hybrid | too slow | +| Model size | Q4 VRAM | Mode | Est. speed | +|---|---|---|---| +| 3B | ~2.0 GB | Full GPU | ~15–20 tok/s | +| 4B | ~2.5 GB | Full GPU | ~12–18 tok/s | +| 7B | ~4.5 GB | Hybrid (~26/32 layers on GPU) | ~8–12 tok/s | +| 13B+ | ~8 GB+ | CPU-heavy hybrid | too slow | ### Recommended local models @@ -71,7 +71,6 @@ Two candidates worth testing, covering different points on the size/quality tradeoff: **Gemma 4 E4B Instruct (Q4 / UD-Q4_K_XL)** - - GGUF file: `gemma-4-E4B-it-UD-Q4_K_XL.gguf` (~2.5 GB) - Source: https://huggingface.co/unsloth/gemma-4-E4B-it-GGUF - Runs fully on GPU. Brand new (April 2025), built for edge hardware, 140+ @@ -79,7 +78,6 @@ tradeoff: to test. **Qwen2.5 7B Instruct (Q4_K_M)** - - GGUF file: `Qwen2.5-7B-Instruct-Q4_K_M.gguf` (~4.5 GB) - Source: https://huggingface.co/Qwen/Qwen2.5-7B-Instruct-GGUF - Runs in hybrid mode (~26 of 32 layers on GPU, rest on CPU), ~8–12 tok/s. @@ -109,7 +107,6 @@ wget -O models/qwen2.5-3b-instruct-q4_k_m.gguf \ ### Starting the server **Gemma 4 E4B** (full GPU): - ```bash ./build/bin/llama-server \ --model models/gemma-4-e4b-it-ud-q4_k_xl.gguf \ @@ -120,7 +117,6 @@ wget -O models/qwen2.5-3b-instruct-q4_k_m.gguf \ ``` **Qwen2.5 7B** (hybrid — tune `--n-gpu-layers` to fit your VRAM): - ```bash ./build/bin/llama-server \ --model models/qwen2.5-7b-instruct-q4_k_m.gguf \ @@ -167,16 +163,15 @@ object changes. Ranked by expected multilingual generation quality for en/it/de/fr/es: -| Model ID | Params | Notes | -| ---------------------------------------- | --------------------- | ------------------------------------------------------------------------------------ | -| `qwen/qwen3-coder:free` | 480B MoE (35B active) | Best free option. Strong multilingual despite "coder" label. Use as quality ceiling. | -| `qwen/qwen3-next-80b-a3b-instruct:free` | 80B MoE (3B active) | Smaller Qwen, useful comparison point. | -| `nvidia/nemotron-3-super-120b-a12b:free` | 120B MoE (12B active) | 262K context, supports structured output. | -| `google/gemma-4-31b-it:free` | 31B | 140+ language support, good European language coverage. | -| `zhipuai/glm-4.5-air:free` | MoE | Multilingual-focused. | +| Model ID | Params | Notes | +|---|---|---| +| `qwen/qwen3-coder:free` | 480B MoE (35B active) | Best free option. Strong multilingual despite "coder" label. Use as quality ceiling. | +| `qwen/qwen3-next-80b-a3b-instruct:free` | 80B MoE (3B active) | Smaller Qwen, useful comparison point. | +| `nvidia/nemotron-3-super-120b-a12b:free` | 120B MoE (12B active) | 262K context, supports structured output. | +| `google/gemma-4-31b-it:free` | 31B | 140+ language support, good European language coverage. | +| `zhipuai/glm-4.5-air:free` | MoE | Multilingual-focused. | **Skip for this pipeline:** - - Llama models — weaker European language generation than Qwen/Gemma - Mistral free tier — requests may be used for model training @@ -199,7 +194,7 @@ change this object and re-run. // config.ts export type ProviderConfig = { - name: string; // used for output folder naming + name: string; // used for output folder naming baseURL: string; apiKey: string; model: string; @@ -210,8 +205,8 @@ export type ProviderConfig = { export const LOCAL_QWEN3B: ProviderConfig = { name: "local-qwen2.5-3b", baseURL: "http://127.0.0.1:8080/v1", - apiKey: "none", // llama.cpp ignores this - model: "qwen2.5-3b", // llama.cpp ignores model name, uses loaded model + apiKey: "none", // llama.cpp ignores this + model: "qwen2.5-3b", // llama.cpp ignores model name, uses loaded model maxTokens: 512, }; @@ -236,7 +231,7 @@ export const OR_GEMMA4_31B: ProviderConfig = { // Anthropic (reference baseline — different adapter required) export const ANTHROPIC_SONNET: ProviderConfig = { name: "anthropic-sonnet", - baseURL: "https://api.anthropic.com/v1", // adapter handles format difference + baseURL: "https://api.anthropic.com/v1", // adapter handles format difference apiKey: process.env.ANTHROPIC_API_KEY!, model: "claude-sonnet-4-6", maxTokens: 512, @@ -244,7 +239,6 @@ export const ANTHROPIC_SONNET: ProviderConfig = { ``` Output from each run lands in: - ``` stage-3-enrich/test/output/{provider.name}/results.json stage-3-enrich/test/output/{provider.name}/metrics.json @@ -258,21 +252,21 @@ The evaluate script compares all `metrics.json` files side by side. The test script measures the following per provider run: -| Metric | What it measures | -| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------ | -| **JSON parse rate** | % of responses that are valid, schema-compliant JSON. Critical — a failed parse is a wasted call. Target: >97% | -| **Field coverage** | % of records where all required fields are present (cefr votes for all translations, descriptions for all languages, glosses/examples for fr/es) | -| **CEFR agreement** | For records that have a `cefr_source` vote, % where the model agrees. Measures calibration. | -| **Language correctness** | Manual spot-check only — automated detection not reliable enough | -| **Tokens/second** | Local only. Indicates overnight run feasibility | +| Metric | What it measures | +|---|---| +| **JSON parse rate** | % of responses that are valid, schema-compliant JSON. Critical — a failed parse is a wasted call. Target: >97% | +| **Field coverage** | % of records where all required fields are present (cefr votes for all translations, descriptions for all languages, glosses/examples for fr/es) | +| **CEFR agreement** | For records that have a `cefr_source` vote, % where the model agrees. Measures calibration. | +| **Language correctness** | Manual spot-check only — automated detection not reliable enough | +| **Tokens/second** | Local only. Indicates overnight run feasibility | ### Decision thresholds -| Metric | Threshold | Action if below | -| --------------- | --------- | ---------------------------------------------- | -| JSON parse rate | < 97% | Do not use this model for production | -| Field coverage | < 95% | Prompt needs revision before production | -| CEFR agreement | < 70% | Model lacks vocabulary knowledge for this task | +| Metric | Threshold | Action if below | +|---|---|---| +| JSON parse rate | < 97% | Do not use this model for production | +| Field coverage | < 95% | Prompt needs revision before production | +| CEFR agreement | < 70% | Model lacks vocabulary knowledge for this task | --- diff --git a/documentation/notes.md b/documentation/notes.md index 45f8955..50c13c1 100644 --- a/documentation/notes.md +++ b/documentation/notes.md @@ -1,23 +1,7 @@ # notes -## prompt - -ive attached the readme of my project. this is my current task: - -task description. - -1. tell me which files you need to see to get the full context of the problem -2. walk me text-only through the problem and the solution -3. if we need to update multiple files: lets go through them one by one, no matter how many files -4. if we go through a file, we'll do it slowly section by section, no matter how many sections -5. how to name the current feature branch? also tell me when its time to git commit and provide a commit message -6. if we have multiple options to do something, also always provide options that reflect current industry standards and best practices -7. never assume anything! always ask for clarification! -8. For every completed task, produce a ticket file in documentation/tickets/. Use ADR format (adr-) for decisions between options with long-term consequences. Use feat-/fix-/chore- for routine tasks. Always include a setup guide or summary of what was done. Suggest the filename. - ## tasks -- **IMPORTANT** db migrations have to be part of the deployment pipeline!!!!!!!!!!!!!!!!!! - put users in separate db - pinning dependencies in package.json files - rethink organisation of datafiles and wordlists @@ -46,7 +30,7 @@ laptop: verify if docker containers run on startup (they shouldnt) ### vps setup - monitoring and logging (eg via chrootkit or rkhunter, logwatch/monit => mails daily with summary) - <<<<<<< HEAD +<<<<<<< HEAD - ~~keep the vps clean (e.g. old docker images/containers)~~ ✅ CI/CD pipeline runs `docker image prune -f` after deploy ### ~~cd/ci pipeline~~ ✅ RESOLVED @@ -55,9 +39,9 @@ Forgejo Actions with runner on VPS, Forgejo built-in container registry. See `de ### ~~postgres backups~~ ✅ RESOLVED -# Daily pg_dump cron job, 7-day retention, dev laptop auto-sync via rsync. See `deployment.md`. - -> > > > > > > dev +Daily pg_dump cron job, 7-day retention, dev laptop auto-sync via rsync. See `deployment.md`. +======= +>>>>>>> dev ### try now option diff --git a/documentation/roasts/gameService.md b/documentation/roasts/gameService.md deleted file mode 100644 index ac3d2ed..0000000 --- a/documentation/roasts/gameService.md +++ /dev/null @@ -1,334 +0,0 @@ -# 🔥 GameService Roast: `apps/api/src/services/gameService.ts` - -> _"It works on my machine" is not a scalability strategy._ - -**Project:** lila — Vocabulary Trainer -**File Roasted:** `gameService.ts` -**Date:** $(date) -**Roaster:** Qwen3.6 - ---- - -## 📋 Executive Summary - -| Metric | Score | Notes | -| ------------- | -------- | ---------------------------------------------------- | -| Code Quality | 8/10 | Clean layering, good types, consistent style | -| Correctness | 6/10 | Race condition + N+1 query are critical | -| Test Coverage | 7/10 | Good happy-path tests, missing concurrency tests | -| Scalability | 5/10 | Will choke at ~100 concurrent users without fixes | -| **Overall** | **7/10** | Solid foundation, but fix the footguns before launch | - ---- - -## 🚨 Critical Issues (Fix Before Production) - -### 1. Race Condition: Lost Update in `evaluateAnswer` - -**Location:** `gameService.ts:45-58` + `InMemoryGameSessionStore.ts:update()` - -// Current flow (VULNERABLE): -const session = await store.get(submission.sessionId); // READ -const updatedAnswers = new Map(session.answers); // MODIFY (local copy) -updatedAnswers.delete(submission.questionId); -await store.update(submission.sessionId, { answers: updatedAnswers }); // WRITE - -The Attack: - - Client submits answer A and answer B for the same question (network retry, bug, or malice) - Both requests read the same session.answers Map (question still present) - Both delete the question from their local copy - Both write back → second write overwrites first - Result: One answer is silently lost, session state desyncs - -Why Tests Missed It: Vitest runs tests synchronously. Race conditions require deliberate concurrency testing. -Fix Options: - -// Option A: Add atomic operation to store interface -interface GameSessionStore { -deleteAnswer(sessionId: string, questionId: string): Promise; -} - -// Option B: Use Valkey Lua script for atomic read-modify-write -// Option C: Optimistic locking with version numbers - -Priority: 🔴 CRITICAL — Data integrity issue 2. N+1 Query: Database Performance Bomb -Location: gameService.ts:24-26 + termModel.ts:getDistractors() - -// For each of N terms, we call getDistractors(): -const questions: GameQuestion[] = await Promise.all( -terms.map(async (term) => { -const distractorTexts = await getDistractors(term.termId, ...); // 🚩 N queries! -}) -); - -Impact Analysis: -Rounds -DB Queries -At 50 concurrent users -3 -1 + 3 = 4 -200 queries/min -10 -1 + 10 = 11 -550 queries/min -20 -1 + 20 = 21 -1,050 queries/min -Each getDistractors() runs: - -SELECT text FROM terms -JOIN translations ON ... -WHERE pos = $1 AND difficulty = $2 AND term_id != $3 AND text != $4 -ORDER BY RANDOM() LIMIT 6 - -Fix: Batch Fetch Distractors - -// Fetch all distractors in ONE query -const allDistractors = await db -.select({ termId: terms.id, text: translations.text }) -.from(terms) -.innerJoin(translations, /_ ... _/) -.where(and( -eq(terms.pos, pos), -eq(translations.difficulty, difficulty), -inArray(terms.id, termIds), // Batch! -)) -.limit(DISTRACTOR_FETCH_COUNT \* termIds.length); - -// Group by termId in JS, then slice to 3 unique distractors per term -const distractorsByTerm = groupByTermId(allDistractors); - -Priority: 🔴 CRITICAL — Performance/scalability issue - -3. Error Handling Inconsistency - Location: gameService.ts:33-36 - -if (uniqueDistractors.length < 3) { -throw new Error(`Not enough unique distractors for term: ${term.targetText}`); // 🚩 -} - -Problem: Raw Error bypasses your errorHandler middleware: - - No HTTP status mapping (defaults to 500) - No structured logging - Inconsistent API responses - -Fix: -import { UnprocessableEntityError } from "../errors/AppError.js"; - -if (uniqueDistractors.length < 3) { -logger.warn({ termId: term.termId, uniqueCount: uniqueDistractors.length }, -"insufficient_distractors"); -throw new UnprocessableEntityError( -`Not enough unique distractors for term: ${term.targetText}` -); -} -Priority: 🟡 HIGH — Observability & UX issue -⚠️ High-Severity Smells 4. Code Duplication: Singleplayer vs Multiplayer -Compare: gameService.ts vs multiplayerGameService.ts -// gameService.ts -const optionTexts = [term.targetText, ...uniqueDistractors.slice(0, 3)]; -const shuffledTexts = shuffleArray(optionTexts); -const correctOptionId = shuffledTexts.indexOf(term.targetText); - -// multiplayerGameService.ts (lines 35-45) -const optionTexts = [correctAnswer.targetText, ...distractorTexts]; -const shuffledTexts = shuffle(optionTexts); // Different function, same logic! -const correctOptionId = shuffledTexts.indexOf(correctAnswer.targetText); - -Risks: - - Fix shuffle bias in one place, forget the other - Add new option type (e.g., etymology hint), update one service only - Harder to test core game logic in isolation - -Fix: Extract pure function to @lila/shared or new @lila/game-logic: - -// packages/shared/src/game-logic.ts -export const buildQuestionOptions = ( -correctAnswer: string, -distractors: string[], -optionCount: number = 4 -): { options: AnswerOption[]; correctOptionId: number } => { -const uniqueDistractors = [...new Set(distractors.filter(d => d !== correctAnswer))]; -const optionTexts = [correctAnswer, ...uniqueDistractors.slice(0, optionCount - 1)]; -const shuffled = shuffleSecure(optionTexts); -const correctOptionId = shuffled.indexOf(correctAnswer); - -return { -options: shuffled.map((text, idx) => ({ optionId: idx, text })), -correctOptionId -}; -}; - -Priority: 🟡 HIGH — Maintainability issue 5. Shuffle Bias: Math.random() Trap -Location: utils.ts:shuffleArray() + multiplayerGameService.ts:shuffle() - -export const shuffleArray = (array: T[]): T[] => { -for (let i = result.length - 1; i > 0; i--) { -const j = Math.floor(Math.random() \* (i + 1)); // 🚩 Modulo bias + non-crypto RNG -// ... -} -}; - -The Math: - - Math.random() has ~53 bits of entropy (fine for vocab) - Math.floor(rand * n) has modulo bias when n isn't a power of 2 - For n=4: bias is ~0.01% (tiny, but non-zero) - -When It Matters: - - Competitive leaderboards ("option 0 is correct 26% of the time") - Achievement systems based on answer patterns - Security-sensitive features (not applicable here, but principle matters) - -Fix (if needed): -import { randomBytes } from "crypto"; - -const shuffleSecure = (array: T[]): T[] => { -const result = [...array]; -for (let i = result.length - 1; i > 0; i--) { -// Use crypto.getRandomValues for better randomness -const rand = randomBytes(4).readUInt32LE(0); -const j = rand % (i + 1); -[result[i], result[j]] = [result[j], result[i]]; -} -return result; -}; - -Priority: 🟢 LOW — Document tradeoff and move on for now - -6. Test Coverage Gaps - File: gameService.test.ts - ✅ Well Tested: - - Happy path: session creation, answer evaluation - Edge cases: duplicate distractors, empty results, invalid inputs - Error propagation from DB layer - -❌ Missing Tests: - -// 1. Concurrency test (race condition) -it("rejects duplicate answers for same question under concurrent load", async () => { -const session = await createGameSession(validRequest, store, "user-1"); -const question = session.questions[0]!; - -// Submit two answers simultaneously -const [result1, result2] = await Promise.allSettled([ -evaluateAnswer({ sessionId, questionId, selectedOptionId: 0 }, store, "user-1"), -evaluateAnswer({ sessionId, questionId, selectedOptionId: 1 }, store, "user-1"), -]); - -// Exactly one should succeed, one should throw ConflictError -expect([result1, result2].filter(r => r.status === "fulfilled")).toHaveLength(1); -}); - -// 2. TTL expiration test -it("deletes session after TTL expires", async () => { -vi.useFakeTimers(); -const session = await createGameSession(validRequest, store, "user-1"); - -vi.advanceTimersByTime(31 _ 60 _ 1000); // 31 minutes - -await expect(store.get(session.sessionId)).resolves.toBeNull(); -}); - -// 3. Distractor fallback strategy test -it("uses fallback when <3 unique distractors available", async () => { -mockGetDistractors.mockResolvedValue(["same", "same", "same", "same"]); -// Should either: (a) fetch from broader pool, or (b) reduce rounds gracefully -}); - -Priority: 🟡 HIGH — Prevents regression on critical fixes -🧼 Code Quality Nitpicks 7. Magic Numbers - -// gameService.ts:52 -await store.create(sessionId, {...}, 30 _ 60 _ 1000); // What is this? - -// termModel.ts:65 -.limit(count); // count=6, but why? - -// shared/schemas/game.ts:15 -optionId: z.number().int().min(0).max(3), // Why 4 options? - -Fix: Centralize in @lila/shared/constants.ts: - -export const GAME*SESSION_TTL_MS = 30 * 60 \_ 1000; -export const DISTRACTOR_FETCH_COUNT = 6; -export const GAME_OPTION_COUNT = 4; -export const MIN_UNIQUE_DISTRACTORS = 3; - -8. Mutable Reference Leakage - Location: InMemoryGameSessionStore.ts:get() - -get(sessionId: string): Promise { -return Promise.resolve(entry.data); // 🚩 Returns mutable reference to internal state -} - -Risk: Any code that does session.answers.delete(...) mutates the store's internal Map directly. -Fix: - -// Option A: Deep clone (simple, works for this data shape) -return Promise.resolve(structuredClone(entry.data)); - -// Option B: Return readonly view (TypeScript-only protection) -return Promise.resolve(entry.data as Readonly); - -// Option C: Use immutable data structures (overkill for now) - -9. Zero Observability - Problem: No logging, no metrics. You're flying blind in production. - Minimal Fix (5 minutes): - -// apps/api/src/lib/logger.ts -import pino from "pino"; -export const logger = pino({ -level: process.env.LOG_LEVEL || "info", -transport: process.env.NODE_ENV === "production" -? { target: "pino-pretty" } -: undefined -}); - -// In gameService.ts: -import { logger } from "../lib/logger.js"; - -logger.info( -{ userId, sourceLang, targetLang, termCount: terms.length }, -"game_session_created" -); - -logger.debug( -{ sessionId, questionId, isCorrect, responseTimeMs }, -"answer_evaluated" -); - -Bonus: Export a Prometheus histogram for game_service_duration_seconds. - -10. ORDER BY RANDOM() Time Bomb - Location: termModel.ts:getGameTerms() + getDistractors() - -.orderBy(sql`RANDOM()`) // 🚩 Fine for 10k rows, slow for 1M - -The Comment Admits It: - -// TODO(post-mvp): ORDER BY RANDOM() sorts the entire filtered result set... - -Reality Check: "Post-MVP" never comes without a ticket. -Fix Options: - --- Option A: Pre-computed random_seed column (updated nightly) -WHERE ... AND random_seed >= random() -ORDER BY random_seed -LIMIT $1 - --- Option B: TABLESAMPLE for approximate sampling (Postgres 9.5+) -FROM terms TABLESAMPLE SYSTEM(10) -WHERE ... -LIMIT $1 - --- Option C: Random offset (simple, but still scans) -OFFSET floor(random() _ (SELECT count(_) FROM terms WHERE ...)) - -Action: Add a ticket to documentation/tickets/t00009.md now. diff --git a/documentation/spec.md b/documentation/spec.md index 29938da..b16fbc0 100644 --- a/documentation/spec.md +++ b/documentation/spec.md @@ -51,9 +51,9 @@ This is the full vision. The current implementation already covers most of it; r ### What is CUT from the MVP -| Feature | Why cut | -| --------------------- | ---------- | -| User stats / profiles | Needs auth | +| Feature | Why cut | +| ------------------------------- | -------------------------------------- | +| User stats / profiles | Needs auth | These are not deleted from the plan — they are deferred. The architecture is already designed to support them. See Section 11 (Post-MVP Ladder). @@ -63,22 +63,22 @@ These are not deleted from the plan — they are deferred. The architecture is a The monorepo structure and tooling are already set up. This is the full stack. -| Layer | Technology | Status | -| ------------ | ------------------------------ | ------------------------------------------------------ | -| Monorepo | pnpm workspaces | ✅ | -| Frontend | React 18, Vite, TypeScript | ✅ | -| Routing | TanStack Router | ✅ | -| Server state | TanStack Query | ✅ | -| Client state | Zustand | ✅ | -| Styling | Tailwind CSS + shadcn/ui | ✅ | -| Backend | Node.js, Express, TypeScript | ✅ | -| Database | PostgreSQL + Drizzle ORM | ✅ | -| Validation | Zod (shared schemas) | ✅ | -| Testing | Vitest, supertest | ✅ | -| Auth | Better Auth (Google + GitHub) | ✅ | -| Deployment | Docker Compose, Caddy, Hetzner | ✅ | -| CI/CD | Forgejo Actions | ✅ | -| Realtime | WebSockets (`ws` library) | ✅ | +| Layer | Technology | Status | +| ------------ | ------------------------------ | ----------- | +| Monorepo | pnpm workspaces | ✅ | +| Frontend | React 18, Vite, TypeScript | ✅ | +| Routing | TanStack Router | ✅ | +| Server state | TanStack Query | ✅ | +| Client state | Zustand | ✅ | +| Styling | Tailwind CSS + shadcn/ui | ✅ | +| Backend | Node.js, Express, TypeScript | ✅ | +| Database | PostgreSQL + Drizzle ORM | ✅ | +| Validation | Zod (shared schemas) | ✅ | +| Testing | Vitest, supertest | ✅ | +| Auth | Better Auth (Google + GitHub) | ✅ | +| Deployment | Docker Compose, Caddy, Hetzner | ✅ | +| CI/CD | Forgejo Actions | ✅ | +| Realtime | WebSockets (`ws` library) | ✅ | | Cache | Valkey | ⚠️ optional (used locally; production/state hardening) | --- @@ -288,27 +288,26 @@ After completing a task: share the code, ask what to refactor and why. The LLM s ## 11. Post-MVP Ladder <<<<<<< HEAD -| Phase | What it adds | Status | +| Phase | What it adds | Status | | ----------------- | ------------------------------------------------------------------------------- | ------ | -| Auth | Better Auth (Google + GitHub), embedded in Express API, user rows in DB | ✅ | -| Deployment | Docker Compose, Caddy, Forgejo, CI/CD, Hetzner VPS | ✅ | -| Hardening (partial) | CI/CD pipeline, DB backups | ✅ | -| User Stats | Games played, score history, profile page | ❌ | -| Multiplayer Lobby | Room creation, join by code, WebSocket connection | ❌ | -| Multiplayer Game | Simultaneous answers, server timer, live scores, winner screen | ❌ | -| Hardening (rest) | Rate limiting, error boundaries, monitoring, accessibility | ❌ | +| Auth | Better Auth (Google + GitHub), embedded in Express API, user rows in DB | ✅ | +| Deployment | Docker Compose, Caddy, Forgejo, CI/CD, Hetzner VPS | ✅ | +| Hardening (partial) | CI/CD pipeline, DB backups | ✅ | +| User Stats | Games played, score history, profile page | ❌ | +| Multiplayer Lobby | Room creation, join by code, WebSocket connection | ❌ | +| Multiplayer Game | Simultaneous answers, server timer, live scores, winner screen | ❌ | +| Hardening (rest) | Rate limiting, error boundaries, monitoring, accessibility | ❌ | ======= -| Phase | What it adds | Status | +| Phase | What it adds | Status | | ------------------- | ----------------------------------------------------------------------- | ------ | -| Auth | Better Auth (Google + GitHub), embedded in Express API, user rows in DB | ✅ | -| Deployment | Docker Compose, Caddy, Forgejo, CI/CD, Hetzner VPS | ✅ | -| Hardening (partial) | CI/CD pipeline, DB backups | ✅ | -| User Stats | Games played, score history, profile page | ❌ | -| Multiplayer Lobby | Room creation, join by code, WebSocket connection | ✅ | -| Multiplayer Game | Simultaneous answers, server timer, live scores, winner screen | ✅ | -| Hardening (rest) | Rate limiting, error boundaries, monitoring, accessibility | ❌ | - -> > > > > > > dev +| Auth | Better Auth (Google + GitHub), embedded in Express API, user rows in DB | ✅ | +| Deployment | Docker Compose, Caddy, Forgejo, CI/CD, Hetzner VPS | ✅ | +| Hardening (partial) | CI/CD pipeline, DB backups | ✅ | +| User Stats | Games played, score history, profile page | ❌ | +| Multiplayer Lobby | Room creation, join by code, WebSocket connection | ✅ | +| Multiplayer Game | Simultaneous answers, server timer, live scores, winner screen | ✅ | +| Hardening (rest) | Rate limiting, error boundaries, monitoring, accessibility | ❌ | +>>>>>>> dev ### Future Data Model Extensions (deferred, additive) diff --git a/documentation/tickets/blueprint.md b/documentation/tickets/blueprint.md deleted file mode 100644 index c5fdf8a..0000000 --- a/documentation/tickets/blueprint.md +++ /dev/null @@ -1,95 +0,0 @@ -# Ticket Blueprint - -Two formats depending on task type. Choose based on whether a meaningful -decision between options was made. - ---- - -## Format A — ADR (architectural/infrastructural decisions) - -Use when: you chose between options with long-term consequences. -Prefix: `adr-` - ---- - -# ADR: - -## Status - -Accepted | Superseded by | Deprecated - -## Date - -YYYY-MM-DD - -## Context - -What is the problem? Why does it need to be solved? - -## Decision - -What was chosen and why in one or two sentences. - -## Options considered - -### Option A — <name> ✅ - -Description. Why it was chosen. - -### Option B — <name> - -Description. Why it was rejected. - -## Consequences - -- What gets better -- What gets worse or more complex -- Operational implications -- What breaks if this needs to be redone - -## Affected files / machines - -- List files, servers, or systems touched - -## References - -- Links to relevant docs - ---- - -## Setup guide / implementation notes - -Step-by-step of what was actually done. - ---- - -## Format B — Task (features, fixes, chores) - -Use when: routine task with a clear solution. -Prefix: `feat-` / `fix-` / `chore-` - ---- - -# <prefix>: <title> - -## Problem - -What was wrong or missing? - -## Options considered - -### Option A — <name> ✅ - -### Option B — <name> - -## Solution - -What was done and why. - -## Files changed - -- `path/to/file.ts` - -## Commit - -`<type>: <message>` diff --git a/documentation/tickets/t00001.md b/documentation/tickets/t00001.md deleted file mode 100644 index f7f1a09..0000000 --- a/documentation/tickets/t00001.md +++ /dev/null @@ -1,107 +0,0 @@ -# ADR: Docker Credential Helper Setup - -## Status - -Accepted - -## Date - -2026-04-26 - -## Context - -Docker credentials for `git.lilastudy.com` and `dhi.io` were stored as base64-encoded strings in `~/.docker/config.json` on both the dev laptop and the VPS. Base64 is not encryption — anyone with read access to the file can decode the credentials instantly. - -## Decision - -Use `pass` (GPG-backed password store) as the Docker credential helper on both machines. - -## Options considered - -### Option A — `pass` (GPG-backed) ✅ - -Stores credentials encrypted with a GPG key. Works on headless servers and desktops without GNOME. Industry standard for Linux servers. - -### Option B — `secretservice` (GNOME keyring) - -Uses the desktop keyring daemon. Not suitable for a headless VPS, and not suitable for an i3 desktop without running `gnome-keyring-daemon` manually. - -### Option C — `gnome-libsecret` - -Same limitations as Option B. - -## Consequences - -- Credentials are now GPG-encrypted at rest on both machines -- Requires GPG passphrase entry when Docker needs to pull credentials - in a new session -- Must be set up manually on each machine — not reproducible via the repo -- VPS setup must be repeated if the server is reprovisioned - -## Affected machines - -- Dev laptop (Debian 13, i3) -- VPS (Debian 13, ARM64, headless) - -## References - -- [docker docs](https://docs.docker.com/reference/cli/docker/login/#credential-stores) -- [pass docs](https://www.passwordstore.org/) - ---- - -## Setup guide - -Repeat these steps on each machine. - -### 1. Install dependencies - -```bash -sudo apt-get install -y pass gnupg2 golang-docker-credential-helpers -``` - -### 2. Generate a GPG key - -```bash -gpg --full-generate-key -``` - -Choose RSA, 4096 bits, no expiry. Set a strong passphrase. - -### 3. Get the key ID - -```bash -gpg --list-secret-keys --keyid-format LONG -``` - -Copy the hex string after the `/` on the `sec` line. - -### 4. Initialise pass - -```bash -pass init <your-key-id> -``` - -### 5. Update `~/.docker/config.json` - -Replace the entire file contents with: - -```json -{ "credsStore": "pass" } -``` - -### 6. Re-login to registries - -```bash -docker login git.lilastudy.com -# dev laptop only: -docker login dhi.io -``` - -### 7. Verify - -```bash -cat ~/.docker/config.json -``` - -Should show only `"credsStore": "pass"` with no `auths` block. diff --git a/documentation/tickets/t00002.md b/documentation/tickets/t00002.md deleted file mode 100644 index 4f7fbb5..0000000 --- a/documentation/tickets/t00002.md +++ /dev/null @@ -1,149 +0,0 @@ -# ADR: Change GAME_ROUNDS from strings to numbers - -## Status - -Accepted - -## Date - -2026-04-28 - -## Context - -`GAME_ROUNDS` in `packages/shared/src/constants.ts` was typed as `["3", "10"] as const`, making `GameRounds` a string union (`"3" | "10"`). This meant `gameService.ts` had to cast the value with `Number(request.rounds)` deep in business logic — a type conversion happening far from the boundary where data enters the system. The type system was lying: `rounds` was described as a string everywhere but used as a number where it mattered. - -## Decision - -Change `GAME_ROUNDS` to `[3, 10] as const` and update the Zod schema to use `z.literal(GAME_ROUNDS)` instead of `z.enum(GAME_ROUNDS)`. The single source of truth remains `constants.ts` — adding a new round count (e.g. `20`) requires only editing that file. - -## Options considered - -### Option A — Numbers everywhere ✅ - -Change `GAME_ROUNDS` to `[3, 10] as const`. Use `z.literal(GAME_ROUNDS)` in the schema. Update the frontend component state and `SettingGroup` props. Drop `Number()` cast in the service. - -Chosen because: JSON carries numbers natively, both ends of the wire are owned by this codebase, and type conversions belong at the boundary — not inside business logic. - -### Option B — Keep strings, accept the cast - -Leave `GAME_ROUNDS` as `["3", "10"]`. The `Number()` cast stays in `gameService.ts`. - -Rejected because: it pushes type conversion into business logic and makes the inferred `GameRequest` type misleading. The cast has to live somewhere — the schema boundary is the right place. - -### Option C — Coerce at the schema boundary - -Keep `GAME_ROUNDS` as numbers but use `z.coerce.number().pipe(z.literal(GAME_ROUNDS))` so the frontend can keep sending strings. - -Rejected because: coercion is for untrusted or uncontrolled inputs (form fields, query params, third-party clients). We control both ends of the wire. Coercing a self-inflicted type mismatch is treating a wound we gave ourselves. - -## Consequences - -- `GameRounds` is now `3 | 10` instead of `"3" | "10"` -- `Number(request.rounds)` cast removed from `gameService.ts` -- `SettingGroup` in `GameSetup.tsx` now accepts `string | number` options -- `useState<string>` for rounds changed to `useState<number>` -- Adding a new round count requires only editing `GAME_ROUNDS` in `constants.ts` -- `z.enum` cannot be used for number literals — `z.literal` must be used instead (this is a Zod constraint, not a project convention) - -## Affected files - -- `packages/shared/src/constants.ts` -- `packages/shared/src/schemas/game.ts` -- `apps/api/src/services/gameService.ts` -- `apps/api/src/services/gameService.test.ts` -- `apps/api/src/controllers/gameController.test.ts` -- `apps/web/src/components/game/GameSetup.tsx` - -## References - -- [Zod literals](https://zod.dev/?id=literals) - ---- - -## Setup guide / implementation notes - -1. In `packages/shared/src/constants.ts`, change: - - ```ts - export const GAME_ROUNDS = ["3", "10"] as const; - ``` - - to: - - ```ts - export const GAME_ROUNDS = [3, 10] as const; - ``` - -2. In `packages/shared/src/schemas/game.ts`, change: - - ```ts - rounds: z.enum(GAME_ROUNDS), - ``` - - to: - - ```ts - rounds: z.literal(GAME_ROUNDS), - ``` - -3. In `apps/api/src/services/gameService.ts`, change: - - ```ts - Number(request.rounds), - ``` - - to: - - ```ts - request.rounds, - ``` - -4. In `apps/api/src/services/gameService.test.ts`, change: - - ```ts - rounds: "3", - ``` - - to: - - ```ts - rounds: 3, - ``` - -5. In `apps/api/src/controllers/gameController.test.ts`, change: - - ```ts - rounds: "3", - ``` - - to: - - ```ts - rounds: 3, - ``` - - Also add a pinning test before the refactor: - - ```ts - it("returns 400 when rounds has an invalid value", async () => { - const res = await request(app) - .post("/api/v1/game/start") - .send({ ...validBody, rounds: "invalid" }); - expect(res.status).toBe(400); - expect(res.body.success).toBe(false); - }); - ``` - -6. In `apps/web/src/components/game/GameSetup.tsx`: - - Update `SettingGroup` props to accept `string | number`: - - ```ts - type SettingGroupProps = { - options: readonly (string | number)[]; - selected: string | number; - onSelect: (value: string | number) => void; - }; - ``` - - - Update `LABELS` lookup to `LABELS[String(option)]` - - Change rounds state from `useState<string>` to `useState<number>` diff --git a/documentation/tickets/t00003.md b/documentation/tickets/t00003.md deleted file mode 100644 index 774fe42..0000000 --- a/documentation/tickets/t00003.md +++ /dev/null @@ -1,37 +0,0 @@ -# refactor: extract shuffleArray to lib/utils, rename correctAnswers to terms - -## Problem - -Two readability issues in `gameService.ts`: - -1. `shuffle` was defined as a private function at the bottom of `gameService.ts`, after the function that calls it. It is a pure generic utility with no dependency on game domain logic, so it had no business living there. - -2. The variable holding terms fetched from the database was named `correctAnswers`. These are word pairs — they only become "correct answers" once options are built around them. The name was premature and misleading. - -## Options considered - -### Option A — Move `shuffle` up in the same file - -Simple, no new files. Fixes the ordering issue but keeps a generic utility buried in domain code. - -### Option B — Extract to `lib/utils.ts` ✅ - -Move `shuffle` (renamed `shuffleArray`) to `apps/api/src/lib/utils.ts` and import it. Cleaner separation: domain logic stays in services, generic utilities live in `lib/`. - -Chosen because `lib/` already exists, the function is reusable, and it gives future utilities a home. - -## Solution - -- Created `apps/api/src/lib/utils.ts` with `shuffleArray` -- Renamed `shuffle` → `shuffleArray` for clarity at the call site -- Removed the inline `shuffle` from `gameService.ts` and imported from `lib/utils.ts` -- Renamed `correctAnswers` → `terms` and `correctAnswer` → `term` throughout `gameService.ts` - -## Files changed - -- `apps/api/src/lib/utils.ts` — created -- `apps/api/src/services/gameService.ts` — removed `shuffle`, updated import, renamed variables - -## Commit - -`refactor: extract shuffleArray to lib/utils, rename correctAnswers to terms` diff --git a/documentation/tickets/t00004.md b/documentation/tickets/t00004.md deleted file mode 100644 index f7d5fea..0000000 --- a/documentation/tickets/t00004.md +++ /dev/null @@ -1,110 +0,0 @@ -# ADR: Dependency injection for GameSessionStore via composition root - -## Status - -Accepted - -## Date - -2026-04-28 - -## Context - -`gameService.ts` had a module-level singleton: - -```ts -const gameSessionStore = new InMemoryGameSessionStore(); -``` - -This made the store invisible to anything outside the file. The `GameSessionStore` interface existed to make the store swappable — but the singleton made that impossible without editing the service itself. Tests shared the same instance across every test run, creating the potential for ghost sessions leaking between tests. The controller also briefly owned the singleton during an intermediate step, which violated the principle that controllers should only handle HTTP concerns. - -## Decision - -Adopt a composition root pattern. The store is created once in `createApp()` and passed down through factory functions: `createApiRouter(store)` → `createGameRouter(store)` → `createGameController(store)` → service calls. Neither the controller nor the service knows which implementation they're working with — they both see `GameSessionStore`. - -## Options considered - -### Option A — Composition root ✅ - -Convert routers and controllers to factory functions. Create the store in `createApp()` and pass it down. The store is created once, at the top, and injected through the call chain. - -Chosen because: clean separation of concerns, no layer below `createApp()` needs to know the concrete implementation, swapping to `ValKeyGameSessionStore` is a one-line change in `app.ts`, and tests get fresh isolated store instances. - -### Option B — Keep singleton in controller - -Leave the store as a module-level singleton in `gameController.ts`. Controllers own the store lifetime. - -Rejected because: controllers should only handle HTTP concerns. Owning infrastructure lifetime is not an HTTP concern. - -### Option C — DI framework (tsyringe, inversify) - -Use a proper dependency injection container. - -Rejected because: overkill for the current scale. The composition root pattern achieves the same result with zero dependencies and no magic. - -## Consequences - -- Swapping `InMemoryGameSessionStore` for `ValKeyGameSessionStore` requires editing one line in `app.ts` -- Tests create fresh `InMemoryGameSessionStore` instances per test — no shared state, no ghost sessions -- Routers and controllers are now factory functions instead of module-level singletons — slightly more verbose but explicitly testable -- `gameController.test.ts` uses `createApp()` which owns the store — controller tests remain integration-style and unaffected -- All layers below `createApp()` depend only on the `GameSessionStore` interface, never the concrete implementation - -## Affected files - -- `apps/api/src/app.ts` — creates the store, passes to `createApiRouter` -- `apps/api/src/routes/apiRouter.ts` — converted to `createApiRouter(store)` factory -- `apps/api/src/routes/gameRouter.ts` — converted to `createGameRouter(store)` factory -- `apps/api/src/controllers/gameController.ts` — converted to `createGameController(store)` factory -- `apps/api/src/services/gameService.ts` — `store` parameter added to both functions, singleton removed -- `apps/api/src/services/gameService.test.ts` — fresh store per describe block via `beforeEach` - -## References - -- [Composition root pattern](https://blog.ploeh.dk/2011/07/28/CompositionRoot/) - ---- - -## Setup guide / implementation notes - -1. `gameService.ts` — remove module-level singleton, add `store: GameSessionStore` parameter to `createGameSession` and `evaluateAnswer` - -2. `gameController.ts` — convert exported functions to a factory: - - ```ts - export const createGameController = (store: GameSessionStore) => ({ - createGame: async (req, res, next) => { ... }, - submitAnswer: async (req, res, next) => { ... }, - }); - ``` - -3. `gameRouter.ts` — convert to factory: - - ```ts - export const createGameRouter = (store: GameSessionStore): Router => { - const router = express.Router(); - const controller = createGameController(store); - router.post("/start", controller.createGame); - router.post("/answer", controller.submitAnswer); - return router; - }; - ``` - -4. `apiRouter.ts` — convert to factory: - - ```ts - export const createApiRouter = (store: GameSessionStore): Router => { - const router = express.Router(); - router.use("/game", createGameRouter(store)); - return router; - }; - ``` - -5. `app.ts` — create the store at the composition root: - - ```ts - const store = new InMemoryGameSessionStore(); - app.use("/api/v1", createApiRouter(store)); - ``` - -6. `gameService.test.ts` — add `let store: InMemoryGameSessionStore` to each `describe` block, reset in `beforeEach`, pass to every service call diff --git a/documentation/tickets/t00005.md b/documentation/tickets/t00005.md deleted file mode 100644 index baf5e2b..0000000 --- a/documentation/tickets/t00005.md +++ /dev/null @@ -1,93 +0,0 @@ -# ADR: Session lifecycle — TTL and replay protection - -## Status - -Accepted - -## Date - -2026-04-28 - -## Context - -`InMemoryGameSessionStore` had no TTL and no cleanup mechanism. Every session created stayed in memory until the process restarted. Additionally, `evaluateAnswer` never removed a question from the answer key after evaluating it, meaning the same question could be submitted multiple times and receive a valid result each time — a potential exploit in multiplayer and a correctness bug in singleplayer. - -## Decision - -Add a `ttlMs` parameter to `GameSessionStore.create()` so both the in-memory and future Valkey implementations handle expiry consistently. Delete questions from the answer key after evaluation. Delete the session when the last question is answered. - -## Options considered - -### Option A — Delete on last answer only - -Simple. Covers replay protection and normal session completion. Abandoned sessions (player starts game, never finishes) still leak memory. - -### Option B — Delete on last answer + TTL on the interface ✅ - -Delete on answer covers normal flow. TTL covers abandoned sessions. TTL on the interface means `ValKeyGameSessionStore` can use Redis-native `EXPIRE` without any interface changes during migration. - -Chosen because it closes the memory leak entirely and makes the Valkey migration a zero-interface-change operation. - -### Option C — TTL hardcoded inside InMemoryGameSessionStore only - -Simpler short-term. But the interface wouldn't carry the TTL parameter, so `ValKeyGameSessionStore` would need a different mechanism — inconsistency between implementations. - -## Consequences - -- Sessions expire after 30 minutes of inactivity regardless of completion state -- Submitting the same question twice throws `NotFoundError` on the second attempt -- Sessions are deleted automatically when the last question is answered -- `GameSessionStore.create()` now requires a `ttlMs` argument — any future implementation must honour it -- `ValKeyGameSessionStore` can implement TTL via Redis `EXPIRE` with no interface changes -- `InMemoryGameSessionStore` stores `{ data, expiresAt }` entries instead of raw `GameSessionData` — expiry is checked lazily on `get()` - -## Affected files - -- `apps/api/src/gameSessionStore/GameSessionStore.ts` — `ttlMs` added to `create` -- `apps/api/src/gameSessionStore/InMemoryGameSessionStore.ts` — TTL implementation -- `apps/api/src/gameSessionStore/InMemoryGameSessionStore.test.ts` — new test file -- `apps/api/src/services/gameService.ts` — passes TTL to `store.create`, deletes question after evaluation, deletes session when empty -- `apps/api/src/services/gameService.test.ts` — replay protection and session cleanup tests added - -## References - -- [Redis EXPIRE command](https://redis.io/commands/expire/) - ---- - -## Setup guide / implementation notes - -1. `GameSessionStore.ts` — add `ttlMs` to `create`: - - ```ts - create(sessionId: string, data: GameSessionData, ttlMs: number): Promise<void>; - ``` - -2. `InMemoryGameSessionStore.ts` — wrap stored data with expiry: - - ```ts - type SessionEntry = { data: GameSessionData; expiresAt: number }; - ``` - - Check expiry on `get()`, delete expired entries lazily. - -3. `gameService.ts` — pass TTL when creating session: - - ```ts - await store.create(sessionId, { answers: answerKey }, 30 * 60 * 1000); - ``` - - After evaluating an answer: - - ```ts - session.answers.delete(submission.questionId); - if (session.answers.size === 0) { - await store.delete(submission.sessionId); - } - ``` - -4. When implementing `ValKeyGameSessionStore`, pass `ttlMs` to Redis `EXPIRE`: - - ```ts - await valkey.set(sessionId, serialize(data), "EX", Math.ceil(ttlMs / 1000)); - ``` diff --git a/documentation/tickets/t00006.md b/documentation/tickets/t00006.md deleted file mode 100644 index edc5e25..0000000 --- a/documentation/tickets/t00006.md +++ /dev/null @@ -1,132 +0,0 @@ -# ADR: Session ownership check and AuthenticatedRequest type - -## Status - -Accepted - -## Date - -2026-04-28 - -## Context - -`evaluateAnswer` accepted any `sessionId` without verifying it belonged to the requesting user. The only protection was the unguessability of a UUID — security through obscurity. If a user intercepted or guessed another user's `sessionId`, they could submit answers on their behalf. - -Additionally, protected controller handlers typed their `req` parameter as `Request`, making `session` optional even though `requireAuth` middleware guarantees it is present. This required non-null assertions (`req.session!`) in business logic — a type assertion that could cause a runtime crash if middleware ordering ever changed. - -## Decision - -Store `userId` in `GameSessionData`. Pass `userId` from the controller into both `createGameSession` and `evaluateAnswer`. Assert ownership on evaluation — if the session's `userId` doesn't match the requesting user's ID, throw `NotFoundError`. Introduce `AuthenticatedRequest` to eliminate non-null assertions in protected handlers. - -## Options considered - -### Option A — AuthenticatedRequest type ✅ - -Define `AuthenticatedRequest = Request & { session: { session: Session; user: User } }` in `types/express.d.ts`. Use it in protected controller handlers instead of `Request`. Requires a single `as express.RequestHandler` cast at route registration due to Express's type limitations. - -Chosen because: eliminates dangerous non-null assertions in business logic. The cast at route registration is a necessary cast caused by a third-party library limitation, not uncertain logic. - -### Option B — Non-null assertion (`req.session!`) - -Keep `Request` on all handlers. Assert `req.session!` at every usage. - -Rejected because: non-null assertions in business logic are dangerous — if middleware ordering ever changes, the assertion silently passes and crashes at runtime. - ---- - -### Option C — NotFoundError (404) on ownership failure ✅ - -When a session exists but belongs to a different user, throw `NotFoundError` with the same message as a missing session. - -Chosen because: session IDs are opaque secrets. Returning 403 would confirm to the caller that the session ID is valid and belongs to someone else — information they shouldn't have. This pattern is used by GitHub, AWS, and most security-conscious APIs. - -### Option D — ForbiddenError (403) on ownership failure - -Explicit error that distinguishes "not found" from "not allowed". - -Rejected because: for user-owned resources identified by opaque IDs, confirming existence to an unauthorised caller is an information leak. 404 is the industry standard for this case. - -## Consequences - -- Alice cannot submit answers for Bob's session — ownership is verified at the service layer -- `req.session.user.id` is accessible without non-null assertions in protected handlers -- `GameSessionData` now carries `userId` — any future `GameSessionStore` implementation must store and return it -- Route registration requires `as express.RequestHandler` cast for protected handlers — one cast per route, in wiring code only -- `ValKeyGameSessionStore` must serialise and deserialise `userId` alongside `answers` - -## Affected files - -- `apps/api/src/types/express.d.ts` — `AuthenticatedRequest` type added -- `apps/api/src/gameSessionStore/GameSessionStore.ts` — `userId` added to `GameSessionData` -- `apps/api/src/gameSessionStore/InMemoryGameSessionStore.test.ts` — updated data fixtures -- `apps/api/src/services/gameService.ts` — `userId` parameter added to both functions, ownership assertion in `evaluateAnswer` -- `apps/api/src/services/gameService.test.ts` — updated all calls, ownership test added -- `apps/api/src/controllers/gameController.ts` — extracts `userId` from `req.session.user.id`, passes to service calls -- `apps/api/src/routes/gameRouter.ts` — `as express.RequestHandler` cast at route registration - -## References - -- [OWASP: Insecure Direct Object Reference](https://owasp.org/www-community/attacks/Insecure_Direct_Object_Reference) -- [HTTP 403 vs 404 for authorization failures](https://stackoverflow.com/questions/3297048/403-forbidden-vs-401-unauthorized-http-responses) - ---- - -## Setup guide / implementation notes - -1. `types/express.d.ts` — add: - - ```ts - export type AuthenticatedRequest = Request & { - session: { session: Session; user: User }; - }; - ``` - -2. `GameSessionStore.ts` — add `userId` to `GameSessionData`: - - ```ts - export type GameSessionData = { - answers: Map<string, number>; - userId: string; - }; - ``` - -3. `gameService.ts` — add `userId` to both function signatures: - - ```ts - export const createGameSession = async ( - request: GameRequest, - store: GameSessionStore, - userId: string, - ): Promise<GameSession> - ``` - - Store it on create: - - ```ts - await store.create( - sessionId, - { answers: answerKey, userId }, - 30 * 60 * 1000, - ); - ``` - - Assert on evaluate: - - ```ts - if (!session || session.userId !== userId) { - throw new NotFoundError(`Game session not found: ${submission.sessionId}`); - } - ``` - -4. `gameController.ts` — extract from authenticated request: - - ```ts - req.session.user.id; - ``` - -5. `gameRouter.ts` — cast at registration: - - ```ts - router.post("/start", controller.createGame as express.RequestHandler); - router.post("/answer", controller.submitAnswer as express.RequestHandler); - ``` diff --git a/documentation/tickets/t00007.md b/documentation/tickets/t00007.md deleted file mode 100644 index 5469049..0000000 --- a/documentation/tickets/t00007.md +++ /dev/null @@ -1,41 +0,0 @@ -# feat: guard against empty terms in createGameSession - -## Problem - -If `getGameTerms` returned an empty array — no vocabulary data matched the requested language, difficulty, and part of speech combination — `createGameSession` would create a session with zero questions and return it. The frontend would receive an empty `questions` array, attempt to render the first question, find nothing, and crash with no useful error message shown to the user. - -## Options considered - -### Option A — `NotFoundError` (404) ✅ - -Throw when `terms.length === 0` before any session is created. The combination of filters yielded no data — that's a "not found" situation. - -Chosen because: the request is technically valid (all filter values are recognised), but the combination has no matching data. 404 is the correct semantic response. - -### Option B — `ValidationError` (400) - -Treat empty results as a bad request. - -Rejected because: the client sent valid input. The problem is missing data, not invalid input. 400 would be misleading. - -## Solution - -Added a guard in `createGameSession` immediately after `getGameTerms`: - -```ts -if (terms.length === 0) { - throw new NotFoundError("No terms found for the given filters"); -} -``` - -The error propagates through the controller's `try/catch` to the error handler, which returns a clean 404 response. No session is created. - -## Files changed - -- `apps/api/src/services/gameService.ts` — empty terms guard added -- `apps/api/src/services/gameService.test.ts` — pinning test added -- `apps/api/src/controllers/gameController.test.ts` — pinning test added at HTTP layer - -## Commit - -`feat: guard against empty terms in createGameSession` diff --git a/documentation/tickets/t00008.md b/documentation/tickets/t00008.md deleted file mode 100644 index 670f610..0000000 --- a/documentation/tickets/t00008.md +++ /dev/null @@ -1,56 +0,0 @@ -# fix: deduplicate distractors, replace tautological test - -## Problem - -Two issues in `createGameSession` and its test suite: - -1. If `getDistractors` returned the correct answer as one of the distractors, `createGameSession` would include it in the options array without filtering it out. `indexOf` would then find the first occurrence, which might not be the one intended as the correct answer — producing a question where the correct answer appears twice and the stored `correctOptionId` is wrong. - -2. The test `"distractors are never the correct answer"` was tautological — it filtered the correct answer out of the options array, then asserted the remaining items were not the correct answer. It was testing that `Array.filter()` works. It could never fail. - -## Options considered - -### Option A — Filter duplicates after fetching, request extra distractors as buffer ✅ - -Filter out any distractor that matches the correct answer after fetching. Request 6 distractors instead of 3 to ensure enough remain after deduplication. Take the first 3 valid ones with `slice(0, 3)`. - -Chosen because: deduplication at the service layer is the right place — `getDistractors` shouldn't need to know what the correct answer is. Requesting extra provides a buffer against collisions. - -### Option B — Fix `getDistractors` to never return the correct answer - -Add a NOT filter in the database query. - -Not chosen for this ticket — the database query is in `@lila/db` and is a separate concern. The service layer should be defensive regardless of what the model layer returns. - -## Solution - -- Filter distractors against the correct answer before building options: - - ```ts - const uniqueDistractors = distractorTexts.filter( - (t) => t !== term.targetText, - ); - const optionTexts = [term.targetText, ...uniqueDistractors.slice(0, 3)]; - ``` - -- Request 6 distractors instead of 3 to account for potential duplicates -- Replaced tautological test with a test that actually exercises the duplicate case: - - ```ts - it("correct answer appears exactly once even if getDistractors returns a duplicate", ...) - ``` - -- Added distractor failure propagation test: - - ```ts - it("propagates getDistractors failure", ...) - ``` - -## Files changed - -- `apps/api/src/services/gameService.ts` — deduplication logic, distractor count increased to 6 -- `apps/api/src/services/gameService.test.ts` — tautological test replaced, failure test added - -## Commit - -`fix: deduplicate distractors, replace tautological test, add distractor failure test` diff --git a/eslint.config.mjs b/eslint.config.mjs index a88b6f1..31b3da2 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -10,9 +10,10 @@ export default defineConfig([ globalIgnores([ "**/dist/**", "node_modules/", + "eslint.config.mjs", + "**/*.config.ts", "routeTree.gen.ts", "scripts/**", - "data-pipeline/**/*", ]), eslint.configs.recommended, @@ -22,19 +23,12 @@ export default defineConfig([ { languageOptions: { parserOptions: { - projectService: { allowDefaultProject: ["*.mjs", "*.ts"] }, + projectService: true, tsconfigRootDir: import.meta.dirname, }, }, }, - { - files: ["eslint.config.mjs"], - rules: { - "@typescript-eslint/no-unsafe-member-access": "off", - "@typescript-eslint/no-unsafe-assignment": "off", - "@typescript-eslint/no-unsafe-call": "off", - }, - }, + { files: ["apps/web/**/*.{ts,tsx}"], extends: [ @@ -48,9 +42,6 @@ export default defineConfig([ rules: { "react-refresh/only-export-components": "off", "@typescript-eslint/only-throw-error": "off", - "@typescript-eslint/no-unsafe-assignment": "off", - "@typescript-eslint/no-unsafe-member-access": "off", - "@typescript-eslint/no-unsafe-call": "off", }, }, { diff --git a/package.json b/package.json index 8e9a1f6..0ed083f 100644 --- a/package.json +++ b/package.json @@ -6,24 +6,13 @@ "scripts": { "build": "pnpm --filter @lila/shared build && pnpm --filter @lila/db build && pnpm --filter @lila/api build", "dev": "concurrently --names \"api,web\" -c \"magenta.bold,green.bold\" \"pnpm --filter @lila/api dev\" \"pnpm --filter @lila/web dev\"", - "prepare": "husky || true", "test": "vitest", "test:run": "vitest run", "lint": "eslint .", "format": "prettier --write .", - "format:check": "prettier --check .", - "typecheck": "pnpm -r typecheck" + "format:check": "prettier --check ." }, - "lint-staged": { - "**/*.{ts,tsx}": [ - "prettier --write", - "eslint --fix" - ], - "**/*.{js,mjs,json,md,css,html}": [ - "prettier --write" - ] - }, - "packageManager": "pnpm@10.33.1", + "packageManager": "pnpm@10.33.0", "devDependencies": { "@eslint/js": "^10.0.1", "@tanstack/eslint-plugin-router": "^1.161.6", @@ -33,8 +22,6 @@ "eslint-config-prettier": "^10.1.8", "eslint-plugin-react-hooks": "^7.0.1", "eslint-plugin-react-refresh": "^0.5.2", - "husky": "^9.1.7", - "lint-staged": "^16.4.0", "prettier": "^3.8.1", "typescript": "^5.9.3", "typescript-eslint": "^8.57.1", diff --git a/packages/db/drizzle/0009_rapid_cobalt_man.sql b/packages/db/drizzle/0009_rapid_cobalt_man.sql deleted file mode 100644 index e3dcc04..0000000 --- a/packages/db/drizzle/0009_rapid_cobalt_man.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE TABLE "dummy" ( - "id" serial PRIMARY KEY NOT NULL -); diff --git a/packages/db/drizzle/0010_thankful_reaper.sql b/packages/db/drizzle/0010_thankful_reaper.sql deleted file mode 100644 index b542c2a..0000000 --- a/packages/db/drizzle/0010_thankful_reaper.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TABLE "dummy" CASCADE; \ No newline at end of file diff --git a/packages/db/drizzle/meta/0007_snapshot.json b/packages/db/drizzle/meta/0007_snapshot.json index 051e87a..e5ee0b5 100644 --- a/packages/db/drizzle/meta/0007_snapshot.json +++ b/packages/db/drizzle/meta/0007_snapshot.json @@ -110,8 +110,12 @@ "name": "account_user_id_user_id_fk", "tableFrom": "account", "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -145,8 +149,12 @@ "name": "deck_terms_deck_id_decks_id_fk", "tableFrom": "deck_terms", "tableTo": "decks", - "columnsFrom": ["deck_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "deck_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" }, @@ -154,8 +162,12 @@ "name": "deck_terms_term_id_terms_id_fk", "tableFrom": "deck_terms", "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "term_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -163,7 +175,10 @@ "compositePrimaryKeys": { "deck_terms_deck_id_term_id_pk": { "name": "deck_terms_deck_id_term_id_pk", - "columns": ["deck_id", "term_id"] + "columns": [ + "deck_id", + "term_id" + ] } }, "uniqueConstraints": {}, @@ -250,7 +265,10 @@ "unique_deck_name": { "name": "unique_deck_name", "nullsNotDistinct": false, - "columns": ["name", "source_language"] + "columns": [ + "name", + "source_language" + ] } }, "policies": {}, @@ -318,8 +336,12 @@ "name": "lobbies_host_user_id_user_id_fk", "tableFrom": "lobbies", "tableTo": "user", - "columnsFrom": ["host_user_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "host_user_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -329,7 +351,9 @@ "lobbies_code_unique": { "name": "lobbies_code_unique", "nullsNotDistinct": false, - "columns": ["code"] + "columns": [ + "code" + ] } }, "policies": {}, @@ -378,8 +402,12 @@ "name": "lobby_players_lobby_id_lobbies_id_fk", "tableFrom": "lobby_players", "tableTo": "lobbies", - "columnsFrom": ["lobby_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "lobby_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" }, @@ -387,8 +415,12 @@ "name": "lobby_players_user_id_user_id_fk", "tableFrom": "lobby_players", "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -396,7 +428,10 @@ "compositePrimaryKeys": { "lobby_players_lobby_id_user_id_pk": { "name": "lobby_players_lobby_id_user_id_pk", - "columns": ["lobby_id", "user_id"] + "columns": [ + "lobby_id", + "user_id" + ] } }, "uniqueConstraints": {}, @@ -480,8 +515,12 @@ "name": "session_user_id_user_id_fk", "tableFrom": "session", "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -491,7 +530,9 @@ "session_token_unique": { "name": "session_token_unique", "nullsNotDistinct": false, - "columns": ["token"] + "columns": [ + "token" + ] } }, "policies": {}, @@ -547,8 +588,12 @@ "name": "term_glosses_term_id_terms_id_fk", "tableFrom": "term_glosses", "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "term_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -558,7 +603,10 @@ "unique_term_gloss": { "name": "unique_term_gloss", "nullsNotDistinct": false, - "columns": ["term_id", "language_code"] + "columns": [ + "term_id", + "language_code" + ] } }, "policies": {}, @@ -593,8 +641,12 @@ "name": "term_topics_term_id_terms_id_fk", "tableFrom": "term_topics", "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "term_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" }, @@ -602,8 +654,12 @@ "name": "term_topics_topic_id_topics_id_fk", "tableFrom": "term_topics", "tableTo": "topics", - "columnsFrom": ["topic_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "topic_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -611,7 +667,10 @@ "compositePrimaryKeys": { "term_topics_term_id_topic_id_pk": { "name": "term_topics_term_id_topic_id_pk", - "columns": ["term_id", "topic_id"] + "columns": [ + "term_id", + "topic_id" + ] } }, "uniqueConstraints": {}, @@ -685,7 +744,10 @@ "unique_source_id": { "name": "unique_source_id", "nullsNotDistinct": false, - "columns": ["source", "source_id"] + "columns": [ + "source", + "source_id" + ] } }, "policies": {}, @@ -741,7 +803,9 @@ "topics_slug_unique": { "name": "topics_slug_unique", "nullsNotDistinct": false, - "columns": ["slug"] + "columns": [ + "slug" + ] } }, "policies": {}, @@ -837,8 +901,12 @@ "name": "translations_term_id_terms_id_fk", "tableFrom": "translations", "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "term_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -848,7 +916,11 @@ "unique_translations": { "name": "unique_translations", "nullsNotDistinct": false, - "columns": ["term_id", "language_code", "text"] + "columns": [ + "term_id", + "language_code", + "text" + ] } }, "policies": {}, @@ -925,7 +997,9 @@ "user_email_unique": { "name": "user_email_unique", "nullsNotDistinct": false, - "columns": ["email"] + "columns": [ + "email" + ] } }, "policies": {}, @@ -1006,5 +1080,9 @@ "roles": {}, "policies": {}, "views": {}, - "_meta": { "columns": {}, "schemas": {}, "tables": {} } -} + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/packages/db/drizzle/meta/0008_snapshot.json b/packages/db/drizzle/meta/0008_snapshot.json index ebeb2b1..aab8d46 100644 --- a/packages/db/drizzle/meta/0008_snapshot.json +++ b/packages/db/drizzle/meta/0008_snapshot.json @@ -110,8 +110,12 @@ "name": "account_user_id_user_id_fk", "tableFrom": "account", "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -145,8 +149,12 @@ "name": "deck_terms_deck_id_decks_id_fk", "tableFrom": "deck_terms", "tableTo": "decks", - "columnsFrom": ["deck_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "deck_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" }, @@ -154,8 +162,12 @@ "name": "deck_terms_term_id_terms_id_fk", "tableFrom": "deck_terms", "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "term_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -163,7 +175,10 @@ "compositePrimaryKeys": { "deck_terms_deck_id_term_id_pk": { "name": "deck_terms_deck_id_term_id_pk", - "columns": ["deck_id", "term_id"] + "columns": [ + "deck_id", + "term_id" + ] } }, "uniqueConstraints": {}, @@ -250,7 +265,10 @@ "unique_deck_name": { "name": "unique_deck_name", "nullsNotDistinct": false, - "columns": ["name", "source_language"] + "columns": [ + "name", + "source_language" + ] } }, "policies": {}, @@ -318,8 +336,12 @@ "name": "lobbies_host_user_id_user_id_fk", "tableFrom": "lobbies", "tableTo": "user", - "columnsFrom": ["host_user_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "host_user_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -329,7 +351,9 @@ "lobbies_code_unique": { "name": "lobbies_code_unique", "nullsNotDistinct": false, - "columns": ["code"] + "columns": [ + "code" + ] } }, "policies": {}, @@ -378,8 +402,12 @@ "name": "lobby_players_lobby_id_lobbies_id_fk", "tableFrom": "lobby_players", "tableTo": "lobbies", - "columnsFrom": ["lobby_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "lobby_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" }, @@ -387,8 +415,12 @@ "name": "lobby_players_user_id_user_id_fk", "tableFrom": "lobby_players", "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -396,7 +428,10 @@ "compositePrimaryKeys": { "lobby_players_lobby_id_user_id_pk": { "name": "lobby_players_lobby_id_user_id_pk", - "columns": ["lobby_id", "user_id"] + "columns": [ + "lobby_id", + "user_id" + ] } }, "uniqueConstraints": {}, @@ -480,8 +515,12 @@ "name": "session_user_id_user_id_fk", "tableFrom": "session", "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "user_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -491,7 +530,9 @@ "session_token_unique": { "name": "session_token_unique", "nullsNotDistinct": false, - "columns": ["token"] + "columns": [ + "token" + ] } }, "policies": {}, @@ -563,8 +604,12 @@ "name": "term_examples_term_id_terms_id_fk", "tableFrom": "term_examples", "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "term_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -574,7 +619,11 @@ "unique_term_example": { "name": "unique_term_example", "nullsNotDistinct": false, - "columns": ["term_id", "language_code", "text"] + "columns": [ + "term_id", + "language_code", + "text" + ] } }, "policies": {}, @@ -635,8 +684,12 @@ "name": "term_glosses_term_id_terms_id_fk", "tableFrom": "term_glosses", "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "term_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -646,7 +699,10 @@ "unique_term_gloss": { "name": "unique_term_gloss", "nullsNotDistinct": false, - "columns": ["term_id", "language_code"] + "columns": [ + "term_id", + "language_code" + ] } }, "policies": {}, @@ -681,8 +737,12 @@ "name": "term_topics_term_id_terms_id_fk", "tableFrom": "term_topics", "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "term_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" }, @@ -690,8 +750,12 @@ "name": "term_topics_topic_id_topics_id_fk", "tableFrom": "term_topics", "tableTo": "topics", - "columnsFrom": ["topic_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "topic_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -699,7 +763,10 @@ "compositePrimaryKeys": { "term_topics_term_id_topic_id_pk": { "name": "term_topics_term_id_topic_id_pk", - "columns": ["term_id", "topic_id"] + "columns": [ + "term_id", + "topic_id" + ] } }, "uniqueConstraints": {}, @@ -773,7 +840,10 @@ "unique_source_id": { "name": "unique_source_id", "nullsNotDistinct": false, - "columns": ["source", "source_id"] + "columns": [ + "source", + "source_id" + ] } }, "policies": {}, @@ -829,7 +899,9 @@ "topics_slug_unique": { "name": "topics_slug_unique", "nullsNotDistinct": false, - "columns": ["slug"] + "columns": [ + "slug" + ] } }, "policies": {}, @@ -925,8 +997,12 @@ "name": "translations_term_id_terms_id_fk", "tableFrom": "translations", "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], + "columnsFrom": [ + "term_id" + ], + "columnsTo": [ + "id" + ], "onDelete": "cascade", "onUpdate": "no action" } @@ -936,7 +1012,11 @@ "unique_translations": { "name": "unique_translations", "nullsNotDistinct": false, - "columns": ["term_id", "language_code", "text"] + "columns": [ + "term_id", + "language_code", + "text" + ] } }, "policies": {}, @@ -1013,7 +1093,9 @@ "user_email_unique": { "name": "user_email_unique", "nullsNotDistinct": false, - "columns": ["email"] + "columns": [ + "email" + ] } }, "policies": {}, @@ -1094,5 +1176,9 @@ "roles": {}, "policies": {}, "views": {}, - "_meta": { "columns": {}, "schemas": {}, "tables": {} } -} + "_meta": { + "columns": {}, + "schemas": {}, + "tables": {} + } +} \ No newline at end of file diff --git a/packages/db/drizzle/meta/0009_snapshot.json b/packages/db/drizzle/meta/0009_snapshot.json deleted file mode 100644 index 6082664..0000000 --- a/packages/db/drizzle/meta/0009_snapshot.json +++ /dev/null @@ -1,1117 +0,0 @@ -{ - "id": "24f8a0f9-40eb-4ad7-b08a-00ab7c98ecd4", - "prevId": "3824b3fb-5334-4efe-aa71-b6dbfb682c15", - "version": "7", - "dialect": "postgresql", - "tables": { - "public.account": { - "name": "account", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "text", - "primaryKey": true, - "notNull": true - }, - "account_id": { - "name": "account_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "provider_id": { - "name": "provider_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "user_id": { - "name": "user_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "access_token": { - "name": "access_token", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "refresh_token": { - "name": "refresh_token", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "id_token": { - "name": "id_token", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "access_token_expires_at": { - "name": "access_token_expires_at", - "type": "timestamp", - "primaryKey": false, - "notNull": false - }, - "refresh_token_expires_at": { - "name": "refresh_token_expires_at", - "type": "timestamp", - "primaryKey": false, - "notNull": false - }, - "scope": { - "name": "scope", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "password": { - "name": "password", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true - } - }, - "indexes": { - "account_userId_idx": { - "name": "account_userId_idx", - "columns": [ - { - "expression": "user_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "account_user_id_user_id_fk": { - "name": "account_user_id_user_id_fk", - "tableFrom": "account", - "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.deck_terms": { - "name": "deck_terms", - "schema": "", - "columns": { - "deck_id": { - "name": "deck_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": { - "deck_terms_deck_id_decks_id_fk": { - "name": "deck_terms_deck_id_decks_id_fk", - "tableFrom": "deck_terms", - "tableTo": "decks", - "columnsFrom": ["deck_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "deck_terms_term_id_terms_id_fk": { - "name": "deck_terms_term_id_terms_id_fk", - "tableFrom": "deck_terms", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": { - "deck_terms_deck_id_term_id_pk": { - "name": "deck_terms_deck_id_term_id_pk", - "columns": ["deck_id", "term_id"] - } - }, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.decks": { - "name": "decks", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "name": { - "name": "name", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "source_language": { - "name": "source_language", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "validated_languages": { - "name": "validated_languages", - "type": "varchar(10)[]", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "type": { - "name": "type", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "idx_decks_type": { - "name": "idx_decks_type", - "columns": [ - { - "expression": "type", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "source_language", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_deck_name": { - "name": "unique_deck_name", - "nullsNotDistinct": false, - "columns": ["name", "source_language"] - } - }, - "policies": {}, - "checkConstraints": { - "source_language_check": { - "name": "source_language_check", - "value": "\"decks\".\"source_language\" IN ('en', 'it', 'de', 'fr', 'es')" - }, - "validated_languages_check": { - "name": "validated_languages_check", - "value": "validated_languages <@ ARRAY['en', 'it', 'de', 'fr', 'es']::varchar[]" - }, - "validated_languages_excludes_source": { - "name": "validated_languages_excludes_source", - "value": "NOT (\"decks\".\"source_language\" = ANY(\"decks\".\"validated_languages\"))" - }, - "deck_type_check": { - "name": "deck_type_check", - "value": "\"decks\".\"type\" IN ('grammar', 'media')" - } - }, - "isRLSEnabled": false - }, - "public.dummy": { - "name": "dummy", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "serial", - "primaryKey": true, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.lobbies": { - "name": "lobbies", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "code": { - "name": "code", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "host_user_id": { - "name": "host_user_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true, - "default": "'waiting'" - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "lobbies_host_user_id_user_id_fk": { - "name": "lobbies_host_user_id_user_id_fk", - "tableFrom": "lobbies", - "tableTo": "user", - "columnsFrom": ["host_user_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "lobbies_code_unique": { - "name": "lobbies_code_unique", - "nullsNotDistinct": false, - "columns": ["code"] - } - }, - "policies": {}, - "checkConstraints": { - "lobby_status_check": { - "name": "lobby_status_check", - "value": "\"lobbies\".\"status\" IN ('waiting', 'in_progress', 'finished')" - } - }, - "isRLSEnabled": false - }, - "public.lobby_players": { - "name": "lobby_players", - "schema": "", - "columns": { - "lobby_id": { - "name": "lobby_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "user_id": { - "name": "user_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "score": { - "name": "score", - "type": "integer", - "primaryKey": false, - "notNull": true, - "default": 0 - }, - "joined_at": { - "name": "joined_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "lobby_players_lobby_id_lobbies_id_fk": { - "name": "lobby_players_lobby_id_lobbies_id_fk", - "tableFrom": "lobby_players", - "tableTo": "lobbies", - "columnsFrom": ["lobby_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "lobby_players_user_id_user_id_fk": { - "name": "lobby_players_user_id_user_id_fk", - "tableFrom": "lobby_players", - "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": { - "lobby_players_lobby_id_user_id_pk": { - "name": "lobby_players_lobby_id_user_id_pk", - "columns": ["lobby_id", "user_id"] - } - }, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.session": { - "name": "session", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "text", - "primaryKey": true, - "notNull": true - }, - "expires_at": { - "name": "expires_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true - }, - "token": { - "name": "token", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true - }, - "ip_address": { - "name": "ip_address", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "user_agent": { - "name": "user_agent", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "user_id": { - "name": "user_id", - "type": "text", - "primaryKey": false, - "notNull": true - } - }, - "indexes": { - "session_userId_idx": { - "name": "session_userId_idx", - "columns": [ - { - "expression": "user_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "session_user_id_user_id_fk": { - "name": "session_user_id_user_id_fk", - "tableFrom": "session", - "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "session_token_unique": { - "name": "session_token_unique", - "nullsNotDistinct": false, - "columns": ["token"] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.term_examples": { - "name": "term_examples", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "language_code": { - "name": "language_code", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "text": { - "name": "text", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "idx_term_examples_term_id": { - "name": "idx_term_examples_term_id", - "columns": [ - { - "expression": "term_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "language_code", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "term_examples_term_id_terms_id_fk": { - "name": "term_examples_term_id_terms_id_fk", - "tableFrom": "term_examples", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_term_example": { - "name": "unique_term_example", - "nullsNotDistinct": false, - "columns": ["term_id", "language_code", "text"] - } - }, - "policies": {}, - "checkConstraints": { - "language_code_check": { - "name": "language_code_check", - "value": "\"term_examples\".\"language_code\" IN ('en', 'it', 'de', 'fr', 'es')" - } - }, - "isRLSEnabled": false - }, - "public.term_glosses": { - "name": "term_glosses", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "language_code": { - "name": "language_code", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "text": { - "name": "text", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "term_glosses_term_id_terms_id_fk": { - "name": "term_glosses_term_id_terms_id_fk", - "tableFrom": "term_glosses", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_term_gloss": { - "name": "unique_term_gloss", - "nullsNotDistinct": false, - "columns": ["term_id", "language_code"] - } - }, - "policies": {}, - "checkConstraints": { - "language_code_check": { - "name": "language_code_check", - "value": "\"term_glosses\".\"language_code\" IN ('en', 'it', 'de', 'fr', 'es')" - } - }, - "isRLSEnabled": false - }, - "public.term_topics": { - "name": "term_topics", - "schema": "", - "columns": { - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "topic_id": { - "name": "topic_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": { - "term_topics_term_id_terms_id_fk": { - "name": "term_topics_term_id_terms_id_fk", - "tableFrom": "term_topics", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "term_topics_topic_id_topics_id_fk": { - "name": "term_topics_topic_id_topics_id_fk", - "tableFrom": "term_topics", - "tableTo": "topics", - "columnsFrom": ["topic_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": { - "term_topics_term_id_topic_id_pk": { - "name": "term_topics_term_id_topic_id_pk", - "columns": ["term_id", "topic_id"] - } - }, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.terms": { - "name": "terms", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "source": { - "name": "source", - "type": "varchar(50)", - "primaryKey": false, - "notNull": false - }, - "source_id": { - "name": "source_id", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "pos": { - "name": "pos", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "idx_terms_source_pos": { - "name": "idx_terms_source_pos", - "columns": [ - { - "expression": "source", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "pos", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_source_id": { - "name": "unique_source_id", - "nullsNotDistinct": false, - "columns": ["source", "source_id"] - } - }, - "policies": {}, - "checkConstraints": { - "pos_check": { - "name": "pos_check", - "value": "\"terms\".\"pos\" IN ('noun', 'verb', 'adjective', 'adverb')" - } - }, - "isRLSEnabled": false - }, - "public.topics": { - "name": "topics", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "slug": { - "name": "slug", - "type": "varchar(50)", - "primaryKey": false, - "notNull": true - }, - "label": { - "name": "label", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "topics_slug_unique": { - "name": "topics_slug_unique", - "nullsNotDistinct": false, - "columns": ["slug"] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.translations": { - "name": "translations", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "language_code": { - "name": "language_code", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "text": { - "name": "text", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "cefr_level": { - "name": "cefr_level", - "type": "varchar(2)", - "primaryKey": false, - "notNull": false - }, - "difficulty": { - "name": "difficulty", - "type": "varchar(20)", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "idx_translations_lang": { - "name": "idx_translations_lang", - "columns": [ - { - "expression": "language_code", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "difficulty", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "cefr_level", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "term_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "translations_term_id_terms_id_fk": { - "name": "translations_term_id_terms_id_fk", - "tableFrom": "translations", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_translations": { - "name": "unique_translations", - "nullsNotDistinct": false, - "columns": ["term_id", "language_code", "text"] - } - }, - "policies": {}, - "checkConstraints": { - "language_code_check": { - "name": "language_code_check", - "value": "\"translations\".\"language_code\" IN ('en', 'it', 'de', 'fr', 'es')" - }, - "cefr_check": { - "name": "cefr_check", - "value": "\"translations\".\"cefr_level\" IN ('A1', 'A2', 'B1', 'B2', 'C1', 'C2')" - }, - "difficulty_check": { - "name": "difficulty_check", - "value": "\"translations\".\"difficulty\" IN ('easy', 'intermediate', 'hard')" - } - }, - "isRLSEnabled": false - }, - "public.user": { - "name": "user", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "text", - "primaryKey": true, - "notNull": true - }, - "name": { - "name": "name", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "email": { - "name": "email", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "email_verified": { - "name": "email_verified", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "image": { - "name": "image", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "user_email_unique": { - "name": "user_email_unique", - "nullsNotDistinct": false, - "columns": ["email"] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.verification": { - "name": "verification", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "text", - "primaryKey": true, - "notNull": true - }, - "identifier": { - "name": "identifier", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "value": { - "name": "value", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "expires_at": { - "name": "expires_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "verification_identifier_idx": { - "name": "verification_identifier_idx", - "columns": [ - { - "expression": "identifier", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - } - }, - "enums": {}, - "schemas": {}, - "sequences": {}, - "roles": {}, - "policies": {}, - "views": {}, - "_meta": { "columns": {}, "schemas": {}, "tables": {} } -} diff --git a/packages/db/drizzle/meta/0010_snapshot.json b/packages/db/drizzle/meta/0010_snapshot.json deleted file mode 100644 index 0f0603f..0000000 --- a/packages/db/drizzle/meta/0010_snapshot.json +++ /dev/null @@ -1,1098 +0,0 @@ -{ - "id": "6c1cb049-807d-43d0-b83e-d3575b80de33", - "prevId": "24f8a0f9-40eb-4ad7-b08a-00ab7c98ecd4", - "version": "7", - "dialect": "postgresql", - "tables": { - "public.account": { - "name": "account", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "text", - "primaryKey": true, - "notNull": true - }, - "account_id": { - "name": "account_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "provider_id": { - "name": "provider_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "user_id": { - "name": "user_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "access_token": { - "name": "access_token", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "refresh_token": { - "name": "refresh_token", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "id_token": { - "name": "id_token", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "access_token_expires_at": { - "name": "access_token_expires_at", - "type": "timestamp", - "primaryKey": false, - "notNull": false - }, - "refresh_token_expires_at": { - "name": "refresh_token_expires_at", - "type": "timestamp", - "primaryKey": false, - "notNull": false - }, - "scope": { - "name": "scope", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "password": { - "name": "password", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true - } - }, - "indexes": { - "account_userId_idx": { - "name": "account_userId_idx", - "columns": [ - { - "expression": "user_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "account_user_id_user_id_fk": { - "name": "account_user_id_user_id_fk", - "tableFrom": "account", - "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.deck_terms": { - "name": "deck_terms", - "schema": "", - "columns": { - "deck_id": { - "name": "deck_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": { - "deck_terms_deck_id_decks_id_fk": { - "name": "deck_terms_deck_id_decks_id_fk", - "tableFrom": "deck_terms", - "tableTo": "decks", - "columnsFrom": ["deck_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "deck_terms_term_id_terms_id_fk": { - "name": "deck_terms_term_id_terms_id_fk", - "tableFrom": "deck_terms", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": { - "deck_terms_deck_id_term_id_pk": { - "name": "deck_terms_deck_id_term_id_pk", - "columns": ["deck_id", "term_id"] - } - }, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.decks": { - "name": "decks", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "name": { - "name": "name", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "source_language": { - "name": "source_language", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "validated_languages": { - "name": "validated_languages", - "type": "varchar(10)[]", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "type": { - "name": "type", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "idx_decks_type": { - "name": "idx_decks_type", - "columns": [ - { - "expression": "type", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "source_language", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_deck_name": { - "name": "unique_deck_name", - "nullsNotDistinct": false, - "columns": ["name", "source_language"] - } - }, - "policies": {}, - "checkConstraints": { - "source_language_check": { - "name": "source_language_check", - "value": "\"decks\".\"source_language\" IN ('en', 'it', 'de', 'fr', 'es')" - }, - "validated_languages_check": { - "name": "validated_languages_check", - "value": "validated_languages <@ ARRAY['en', 'it', 'de', 'fr', 'es']::varchar[]" - }, - "validated_languages_excludes_source": { - "name": "validated_languages_excludes_source", - "value": "NOT (\"decks\".\"source_language\" = ANY(\"decks\".\"validated_languages\"))" - }, - "deck_type_check": { - "name": "deck_type_check", - "value": "\"decks\".\"type\" IN ('grammar', 'media')" - } - }, - "isRLSEnabled": false - }, - "public.lobbies": { - "name": "lobbies", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "code": { - "name": "code", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "host_user_id": { - "name": "host_user_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true, - "default": "'waiting'" - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "lobbies_host_user_id_user_id_fk": { - "name": "lobbies_host_user_id_user_id_fk", - "tableFrom": "lobbies", - "tableTo": "user", - "columnsFrom": ["host_user_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "lobbies_code_unique": { - "name": "lobbies_code_unique", - "nullsNotDistinct": false, - "columns": ["code"] - } - }, - "policies": {}, - "checkConstraints": { - "lobby_status_check": { - "name": "lobby_status_check", - "value": "\"lobbies\".\"status\" IN ('waiting', 'in_progress', 'finished')" - } - }, - "isRLSEnabled": false - }, - "public.lobby_players": { - "name": "lobby_players", - "schema": "", - "columns": { - "lobby_id": { - "name": "lobby_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "user_id": { - "name": "user_id", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "score": { - "name": "score", - "type": "integer", - "primaryKey": false, - "notNull": true, - "default": 0 - }, - "joined_at": { - "name": "joined_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "lobby_players_lobby_id_lobbies_id_fk": { - "name": "lobby_players_lobby_id_lobbies_id_fk", - "tableFrom": "lobby_players", - "tableTo": "lobbies", - "columnsFrom": ["lobby_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "lobby_players_user_id_user_id_fk": { - "name": "lobby_players_user_id_user_id_fk", - "tableFrom": "lobby_players", - "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": { - "lobby_players_lobby_id_user_id_pk": { - "name": "lobby_players_lobby_id_user_id_pk", - "columns": ["lobby_id", "user_id"] - } - }, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.session": { - "name": "session", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "text", - "primaryKey": true, - "notNull": true - }, - "expires_at": { - "name": "expires_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true - }, - "token": { - "name": "token", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true - }, - "ip_address": { - "name": "ip_address", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "user_agent": { - "name": "user_agent", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "user_id": { - "name": "user_id", - "type": "text", - "primaryKey": false, - "notNull": true - } - }, - "indexes": { - "session_userId_idx": { - "name": "session_userId_idx", - "columns": [ - { - "expression": "user_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "session_user_id_user_id_fk": { - "name": "session_user_id_user_id_fk", - "tableFrom": "session", - "tableTo": "user", - "columnsFrom": ["user_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "session_token_unique": { - "name": "session_token_unique", - "nullsNotDistinct": false, - "columns": ["token"] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.term_examples": { - "name": "term_examples", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "language_code": { - "name": "language_code", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "text": { - "name": "text", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "idx_term_examples_term_id": { - "name": "idx_term_examples_term_id", - "columns": [ - { - "expression": "term_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "language_code", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "term_examples_term_id_terms_id_fk": { - "name": "term_examples_term_id_terms_id_fk", - "tableFrom": "term_examples", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_term_example": { - "name": "unique_term_example", - "nullsNotDistinct": false, - "columns": ["term_id", "language_code", "text"] - } - }, - "policies": {}, - "checkConstraints": { - "language_code_check": { - "name": "language_code_check", - "value": "\"term_examples\".\"language_code\" IN ('en', 'it', 'de', 'fr', 'es')" - } - }, - "isRLSEnabled": false - }, - "public.term_glosses": { - "name": "term_glosses", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "language_code": { - "name": "language_code", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "text": { - "name": "text", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "term_glosses_term_id_terms_id_fk": { - "name": "term_glosses_term_id_terms_id_fk", - "tableFrom": "term_glosses", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_term_gloss": { - "name": "unique_term_gloss", - "nullsNotDistinct": false, - "columns": ["term_id", "language_code"] - } - }, - "policies": {}, - "checkConstraints": { - "language_code_check": { - "name": "language_code_check", - "value": "\"term_glosses\".\"language_code\" IN ('en', 'it', 'de', 'fr', 'es')" - } - }, - "isRLSEnabled": false - }, - "public.term_topics": { - "name": "term_topics", - "schema": "", - "columns": { - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "topic_id": { - "name": "topic_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": { - "term_topics_term_id_terms_id_fk": { - "name": "term_topics_term_id_terms_id_fk", - "tableFrom": "term_topics", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "term_topics_topic_id_topics_id_fk": { - "name": "term_topics_topic_id_topics_id_fk", - "tableFrom": "term_topics", - "tableTo": "topics", - "columnsFrom": ["topic_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": { - "term_topics_term_id_topic_id_pk": { - "name": "term_topics_term_id_topic_id_pk", - "columns": ["term_id", "topic_id"] - } - }, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.terms": { - "name": "terms", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "source": { - "name": "source", - "type": "varchar(50)", - "primaryKey": false, - "notNull": false - }, - "source_id": { - "name": "source_id", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "pos": { - "name": "pos", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "idx_terms_source_pos": { - "name": "idx_terms_source_pos", - "columns": [ - { - "expression": "source", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "pos", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_source_id": { - "name": "unique_source_id", - "nullsNotDistinct": false, - "columns": ["source", "source_id"] - } - }, - "policies": {}, - "checkConstraints": { - "pos_check": { - "name": "pos_check", - "value": "\"terms\".\"pos\" IN ('noun', 'verb', 'adjective', 'adverb')" - } - }, - "isRLSEnabled": false - }, - "public.topics": { - "name": "topics", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "slug": { - "name": "slug", - "type": "varchar(50)", - "primaryKey": false, - "notNull": true - }, - "label": { - "name": "label", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "topics_slug_unique": { - "name": "topics_slug_unique", - "nullsNotDistinct": false, - "columns": ["slug"] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.translations": { - "name": "translations", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "term_id": { - "name": "term_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "language_code": { - "name": "language_code", - "type": "varchar(10)", - "primaryKey": false, - "notNull": true - }, - "text": { - "name": "text", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "cefr_level": { - "name": "cefr_level", - "type": "varchar(2)", - "primaryKey": false, - "notNull": false - }, - "difficulty": { - "name": "difficulty", - "type": "varchar(20)", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "idx_translations_lang": { - "name": "idx_translations_lang", - "columns": [ - { - "expression": "language_code", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "difficulty", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "cefr_level", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "term_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "translations_term_id_terms_id_fk": { - "name": "translations_term_id_terms_id_fk", - "tableFrom": "translations", - "tableTo": "terms", - "columnsFrom": ["term_id"], - "columnsTo": ["id"], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "unique_translations": { - "name": "unique_translations", - "nullsNotDistinct": false, - "columns": ["term_id", "language_code", "text"] - } - }, - "policies": {}, - "checkConstraints": { - "language_code_check": { - "name": "language_code_check", - "value": "\"translations\".\"language_code\" IN ('en', 'it', 'de', 'fr', 'es')" - }, - "cefr_check": { - "name": "cefr_check", - "value": "\"translations\".\"cefr_level\" IN ('A1', 'A2', 'B1', 'B2', 'C1', 'C2')" - }, - "difficulty_check": { - "name": "difficulty_check", - "value": "\"translations\".\"difficulty\" IN ('easy', 'intermediate', 'hard')" - } - }, - "isRLSEnabled": false - }, - "public.user": { - "name": "user", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "text", - "primaryKey": true, - "notNull": true - }, - "name": { - "name": "name", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "email": { - "name": "email", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "email_verified": { - "name": "email_verified", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "image": { - "name": "image", - "type": "text", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "user_email_unique": { - "name": "user_email_unique", - "nullsNotDistinct": false, - "columns": ["email"] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.verification": { - "name": "verification", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "text", - "primaryKey": true, - "notNull": true - }, - "identifier": { - "name": "identifier", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "value": { - "name": "value", - "type": "text", - "primaryKey": false, - "notNull": true - }, - "expires_at": { - "name": "expires_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "verification_identifier_idx": { - "name": "verification_identifier_idx", - "columns": [ - { - "expression": "identifier", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - } - }, - "enums": {}, - "schemas": {}, - "sequences": {}, - "roles": {}, - "policies": {}, - "views": {}, - "_meta": { "columns": {}, "schemas": {}, "tables": {} } -} diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json index 65dc2f0..f86ac07 100644 --- a/packages/db/drizzle/meta/_journal.json +++ b/packages/db/drizzle/meta/_journal.json @@ -64,20 +64,6 @@ "when": 1776695279870, "tag": "0008_far_energizer", "breakpoints": true - }, - { - "idx": 9, - "version": "7", - "when": 1776928720684, - "tag": "0009_rapid_cobalt_man", - "breakpoints": true - }, - { - "idx": 10, - "version": "7", - "when": 1776929932845, - "tag": "0010_thankful_reaper", - "breakpoints": true } ] -} +} \ No newline at end of file diff --git a/packages/db/package.json b/packages/db/package.json index ee17556..a717652 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -4,10 +4,9 @@ "private": true, "type": "module", "scripts": { - "build": "rm -rf dist && tsc", + "build": "tsc", "generate": "drizzle-kit generate", - "migrate": "drizzle-kit migrate", - "typecheck": "tsc --noEmit" + "migrate": "drizzle-kit migrate" }, "dependencies": { "@lila/shared": "workspace:*", diff --git a/packages/db/src/index.ts b/packages/db/src/index.ts index 567a460..baa05e0 100644 --- a/packages/db/src/index.ts +++ b/packages/db/src/index.ts @@ -6,13 +6,10 @@ import { dirname } from "path"; import * as schema from "./db/schema.js"; config({ - path: resolve(dirname(fileURLToPath(import.meta.url)), "../../../../.env"), + path: resolve(dirname(fileURLToPath(import.meta.url)), "../../../.env"), }); -export const db = drizzle( - process.env["DATABASE_URL_LOCAL"] ?? process.env["DATABASE_URL"]!, - { schema }, -); +export const db = drizzle(process.env["DATABASE_URL"]!, { schema }); export * from "./models/termModel.js"; export * from "./models/lobbyModel.js"; diff --git a/packages/db/src/migrate.ts b/packages/db/src/migrate.ts deleted file mode 100644 index 5fd82ab..0000000 --- a/packages/db/src/migrate.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { config } from "dotenv"; -import { drizzle } from "drizzle-orm/node-postgres"; -import { migrate } from "drizzle-orm/node-postgres/migrator"; -import { Pool } from "pg"; -import { resolve, dirname } from "path"; -import { fileURLToPath } from "url"; - -config({ - path: resolve(dirname(fileURLToPath(import.meta.url)), "../../../.env"), -}); - -const pool = new Pool({ connectionString: process.env["DATABASE_URL"]! }); -const db = drizzle(pool); - -console.log("starting database migrations..."); - -await migrate(db, { - migrationsFolder: resolve( - dirname(fileURLToPath(import.meta.url)), - "../../drizzle", - ), -}); - -await pool.end(); -console.log("database migrations complete."); diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json index c8c1b3a..1c40fbd 100644 --- a/packages/db/tsconfig.json +++ b/packages/db/tsconfig.json @@ -5,12 +5,11 @@ "moduleResolution": "NodeNext", "outDir": "./dist", "resolveJsonModule": true, - "types": ["vitest/globals"] + "types": ["vitest/globals"], }, "include": [ "src", "vitest.config.ts", - "drizzle.config.ts", - "../../data-pipeline/archive/packages-db-src-old-seeding-scripts/data" - ] + "../../data-pipeline/archive/packages-db-src-old-seeding-scripts/data", + ], } diff --git a/packages/shared/package.json b/packages/shared/package.json index c46ab0a..bf6aa8a 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -4,8 +4,7 @@ "private": true, "type": "module", "scripts": { - "build": "tsc", - "typecheck": "tsc --noEmit" + "build": "tsc" }, "exports": { ".": "./dist/src/index.js" diff --git a/packages/shared/src/constants.ts b/packages/shared/src/constants.ts index 252bfff..ebe90ce 100644 --- a/packages/shared/src/constants.ts +++ b/packages/shared/src/constants.ts @@ -4,7 +4,7 @@ export type SupportedLanguageCode = (typeof SUPPORTED_LANGUAGE_CODES)[number]; export const SUPPORTED_POS = ["noun", "verb", "adjective", "adverb"] as const; export type SupportedPos = (typeof SUPPORTED_POS)[number]; -export const GAME_ROUNDS = [3, 10] as const; +export const GAME_ROUNDS = ["3", "10"] as const; export type GameRounds = (typeof GAME_ROUNDS)[number]; export const CEFR_LEVELS = ["A1", "A2", "B1", "B2", "C1", "C2"] as const; diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index 582394e..7dc79f5 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -1,4 +1,3 @@ export * from "./constants.js"; export * from "./schemas/game.js"; export * from "./schemas/lobby.js"; -export * from "./schemas/auth.js"; diff --git a/packages/shared/src/schemas/auth.ts b/packages/shared/src/schemas/auth.ts deleted file mode 100644 index 6aaf35d..0000000 --- a/packages/shared/src/schemas/auth.ts +++ /dev/null @@ -1,14 +0,0 @@ -import * as z from "zod"; - -export const ResetPasswordSearchSchema = z.object({ - token: z.string().catch(""), -}); - -export type ResetPasswordSearch = z.infer<typeof ResetPasswordSearchSchema>; - -export const AuthModalSearchSchema = z.object({ - modal: z.enum(["auth"]).optional().catch(undefined), - redirect: z.string().optional().catch(undefined), -}); - -export type AuthModalSearch = z.infer<typeof AuthModalSearchSchema>; diff --git a/packages/shared/src/schemas/game.ts b/packages/shared/src/schemas/game.ts index 51f1cc2..2a32a24 100644 --- a/packages/shared/src/schemas/game.ts +++ b/packages/shared/src/schemas/game.ts @@ -12,7 +12,7 @@ export const GameRequestSchema = z.object({ target_language: z.enum(SUPPORTED_LANGUAGE_CODES), pos: z.enum(SUPPORTED_POS), difficulty: z.enum(DIFFICULTY_LEVELS), - rounds: z.literal(GAME_ROUNDS), + rounds: z.enum(GAME_ROUNDS), }); export type GameRequest = z.infer<typeof GameRequestSchema>; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4453586..ef2ffc4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ importers: version: 1.161.6(eslint@10.0.3(jiti@2.6.1))(typescript@5.9.3) '@vitest/coverage-v8': specifier: ^4.1.0 - version: 4.1.0(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))) + version: 4.1.0(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))) concurrently: specifier: ^9.2.1 version: 9.2.1 @@ -32,12 +32,6 @@ importers: eslint-plugin-react-refresh: specifier: ^0.5.2 version: 0.5.2(eslint@10.0.3(jiti@2.6.1)) - husky: - specifier: ^9.1.7 - version: 9.1.7 - lint-staged: - specifier: ^16.4.0 - version: 16.4.0 prettier: specifier: ^3.8.1 version: 3.8.1 @@ -49,7 +43,7 @@ importers: version: 8.57.1(eslint@10.0.3(jiti@2.6.1))(typescript@5.9.3) vitest: specifier: ^4.1.0 - version: 4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)) + version: 4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)) apps/api: dependencies: @@ -61,22 +55,13 @@ importers: version: link:../../packages/shared better-auth: specifier: ^1.6.2 - version: 1.6.2(@opentelemetry/api@1.9.1)(better-sqlite3@12.9.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))) + version: 1.6.2(@opentelemetry/api@1.9.1)(better-sqlite3@12.9.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))) cors: specifier: ^2.8.6 version: 2.8.6 express: specifier: ^5.2.1 version: 5.2.1 - express-rate-limit: - specifier: ^8.4.0 - version: 8.4.0(express@5.2.1) - helmet: - specifier: ^8.1.0 - version: 8.1.0 - resend: - specifier: ^6.12.2 - version: 6.12.2 ws: specifier: ^8.20.0 version: 8.20.0 @@ -107,7 +92,7 @@ importers: version: link:../../packages/shared '@tailwindcss/vite': specifier: ^4.2.2 - version: 4.2.2(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)) + version: 4.2.2(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)) '@tanstack/react-router': specifier: ^1.168.1 version: 1.168.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4) @@ -116,23 +101,20 @@ importers: version: 1.166.10(@tanstack/react-router@1.168.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(@tanstack/router-core@1.168.1)(csstype@3.2.3)(react-dom@19.2.4(react@19.2.4))(react@19.2.4) better-auth: specifier: ^1.6.2 - version: 1.6.2(@opentelemetry/api@1.9.1)(better-sqlite3@12.9.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@24.12.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))) + version: 1.6.2(@opentelemetry/api@1.9.1)(better-sqlite3@12.9.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@24.12.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))) react: specifier: ^19.2.4 version: 19.2.4 react-dom: specifier: ^19.2.4 version: 19.2.4(react@19.2.4) - sonner: - specifier: ^2.0.7 - version: 2.0.7(react-dom@19.2.4(react@19.2.4))(react@19.2.4) tailwindcss: specifier: ^4.2.2 version: 4.2.2 devDependencies: '@tanstack/router-plugin': specifier: ^1.167.2 - version: 1.167.2(@tanstack/react-router@1.168.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)) + version: 1.167.2(@tanstack/react-router@1.168.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)) '@types/node': specifier: ^24.12.0 version: 24.12.0 @@ -144,13 +126,13 @@ importers: version: 19.2.3(@types/react@19.2.14) '@vitejs/plugin-react': specifier: ^6.0.1 - version: 6.0.1(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)) + version: 6.0.1(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)) jsdom: specifier: ^29.0.1 version: 29.0.1(@noble/hashes@2.2.0) vite: specifier: ^8.0.1 - version: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3) + version: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0) data-pipeline: dependencies: @@ -1096,9 +1078,6 @@ packages: '@rolldown/pluginutils@1.0.0-rc.7': resolution: {integrity: sha512-qujRfC8sFVInYSPPMLQByRh7zhwkGFS4+tyMQ83srV1qrxL4g8E2tyxVVyxd0+8QeBM1mIk9KbWxkegRr76XzA==} - '@stablelib/base64@1.0.1': - resolution: {integrity: sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ==} - '@standard-schema/spec@1.1.0': resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==} @@ -1497,26 +1476,14 @@ packages: ajv@6.14.0: resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==} - ansi-escapes@7.3.0: - resolution: {integrity: sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==} - engines: {node: '>=18'} - ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - ansi-regex@6.2.2: - resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==} - engines: {node: '>=12'} - ansi-styles@4.3.0: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} - ansi-styles@6.2.3: - resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==} - engines: {node: '>=12'} - ansis@4.2.0: resolution: {integrity: sha512-HqZ5rWlFjGiV0tDm3UxxgNRqsOTniqoKZu0pIAfh7TZQMGuZK+hH0drySty0si0QXj1ieop4+SkSfPZBPPkHig==} engines: {node: '>=14'} @@ -1701,14 +1668,6 @@ packages: chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} - cli-cursor@5.0.0: - resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==} - engines: {node: '>=18'} - - cli-truncate@5.2.0: - resolution: {integrity: sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==} - engines: {node: '>=20'} - cliui@8.0.1: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} @@ -1728,17 +1687,10 @@ packages: color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - colorette@2.0.20: - resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} - combined-stream@1.0.8: resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} engines: {node: '>= 0.8'} - commander@14.0.3: - resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==} - engines: {node: '>=20'} - component-emitter@1.3.1: resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==} @@ -1951,9 +1903,6 @@ packages: electron-to-chromium@1.5.321: resolution: {integrity: sha512-L2C7Q279W2D/J4PLZLk7sebOILDSWos7bMsMNN06rK482umHUrh/3lM8G7IlHFOYip2oAg5nha1rCMxr/rs6ZQ==} - emoji-regex@10.6.0: - resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==} - emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -1972,10 +1921,6 @@ packages: resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==} engines: {node: '>=0.12'} - environment@1.1.0: - resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==} - engines: {node: '>=18'} - es-define-property@1.0.1: resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==} engines: {node: '>= 0.4'} @@ -2092,9 +2037,6 @@ packages: resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} engines: {node: '>= 0.6'} - eventemitter3@5.0.4: - resolution: {integrity: sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==} - expand-template@2.0.3: resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==} engines: {node: '>=6'} @@ -2103,12 +2045,6 @@ packages: resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==} engines: {node: '>=12.0.0'} - express-rate-limit@8.4.0: - resolution: {integrity: sha512-gDK8yiqKxrGta+3WtON59arrrw6GLmadA1qoFgYXzdcch8fmKDID2XqO8itsi3f1wufXYPT51387dN6cvVBS3Q==} - engines: {node: '>= 16'} - peerDependencies: - express: '>= 4.11' - express@5.2.1: resolution: {integrity: sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==} engines: {node: '>= 18'} @@ -2125,9 +2061,6 @@ packages: fast-safe-stringify@2.1.1: resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==} - fast-sha256@1.3.0: - resolution: {integrity: sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ==} - fdir@6.5.0: resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} engines: {node: '>=12.0.0'} @@ -2202,10 +2135,6 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} - get-east-asian-width@1.5.0: - resolution: {integrity: sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==} - engines: {node: '>=18'} - get-intrinsic@1.3.0: resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} engines: {node: '>= 0.4'} @@ -2256,10 +2185,6 @@ packages: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} - helmet@8.1.0: - resolution: {integrity: sha512-jOiHyAZsmnr8LqoPGmCjYAaiuWwjAPLgY8ZX2XrmHawt99/u1y6RgrZMTeoPfpUbV96HOalYgz1qzkRbw54Pmg==} - engines: {node: '>=18.0.0'} - hermes-estree@0.25.1: resolution: {integrity: sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==} @@ -2277,11 +2202,6 @@ packages: resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==} engines: {node: '>= 0.8'} - husky@9.1.7: - resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==} - engines: {node: '>=18'} - hasBin: true - iconv-lite@0.7.2: resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==} engines: {node: '>=0.10.0'} @@ -2307,10 +2227,6 @@ packages: ini@1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - ip-address@10.1.0: - resolution: {integrity: sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==} - engines: {node: '>= 12'} - ipaddr.js@1.9.1: resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} engines: {node: '>= 0.10'} @@ -2327,10 +2243,6 @@ packages: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} - is-fullwidth-code-point@5.1.0: - resolution: {integrity: sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==} - engines: {node: '>=18'} - is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} @@ -2490,23 +2402,10 @@ packages: resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==} engines: {node: '>= 12.0.0'} - lint-staged@16.4.0: - resolution: {integrity: sha512-lBWt8hujh/Cjysw5GYVmZpFHXDCgZzhrOm8vbcUdobADZNOK/bRshr2kM3DfgrrtR1DQhfupW9gnIXOfiFi+bw==} - engines: {node: '>=20.17'} - hasBin: true - - listr2@9.0.5: - resolution: {integrity: sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==} - engines: {node: '>=20.0.0'} - locate-path@6.0.0: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} - log-update@6.1.0: - resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==} - engines: {node: '>=18'} - lru-cache@11.2.7: resolution: {integrity: sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==} engines: {node: 20 || >=22} @@ -2564,10 +2463,6 @@ packages: engines: {node: '>=4.0.0'} hasBin: true - mimic-function@5.0.1: - resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==} - engines: {node: '>=18'} - mimic-response@3.1.0: resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==} engines: {node: '>=10'} @@ -2633,10 +2528,6 @@ packages: once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} - onetime@7.0.0: - resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==} - engines: {node: '>=18'} - optionator@0.9.4: resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} engines: {node: '>= 0.8.0'} @@ -2715,9 +2606,6 @@ packages: resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} engines: {node: '>=12'} - postal-mime@2.7.4: - resolution: {integrity: sha512-0WdnFQYUrPGGTFu1uOqD2s7omwua8xaeYGdO6rb88oD5yJ/4pPHDA4sdWqfD8wQVfCny563n/HQS7zTFft+f/g==} - postcss@8.5.8: resolution: {integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==} engines: {node: ^10 || ^12 || >=14} @@ -2809,25 +2697,9 @@ packages: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} - resend@6.12.2: - resolution: {integrity: sha512-xwgmU4b0OqoabJsIoK/x0Whk0Fcs3bpbK4i/DEWPiE5hYJHyHl0TbB6QbI3gIr+bLdLUJ1GYm/fe41aVFuHXgw==} - engines: {node: '>=20'} - peerDependencies: - '@react-email/render': '*' - peerDependenciesMeta: - '@react-email/render': - optional: true - resolve-pkg-maps@1.0.0: resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} - restore-cursor@5.1.0: - resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==} - engines: {node: '>=18'} - - rfdc@1.4.1: - resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==} - rolldown@1.0.0-rc.10: resolution: {integrity: sha512-q7j6vvarRFmKpgJUT8HCAUljkgzEp4LAhPlJUvQhA5LA1SUL36s5QCysMutErzL3EbNOZOkoziSx9iZC4FddKA==} engines: {node: ^20.19.0 || >=22.12.0} @@ -2920,30 +2792,12 @@ packages: siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} - signal-exit@4.1.0: - resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} - engines: {node: '>=14'} - simple-concat@1.0.1: resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} simple-get@4.0.1: resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==} - slice-ansi@7.1.2: - resolution: {integrity: sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==} - engines: {node: '>=18'} - - slice-ansi@8.0.0: - resolution: {integrity: sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==} - engines: {node: '>=20'} - - sonner@2.0.7: - resolution: {integrity: sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==} - peerDependencies: - react: ^18.0.0 || ^19.0.0 || ^19.0.0-rc - react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-rc - source-map-js@1.2.1: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} @@ -2970,9 +2824,6 @@ packages: stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} - standardwebhooks@1.0.0: - resolution: {integrity: sha512-BbHGOQK9olHPMvQNHWul6MYlrRTAOKn03rOe4A8O3CLWhNf4YHBqq2HJKKC+sfqpxiBY52pNeesD6jIiLDz8jg==} - statuses@2.0.2: resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==} engines: {node: '>= 0.8'} @@ -2980,22 +2831,10 @@ packages: std-env@4.0.0: resolution: {integrity: sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==} - string-argv@0.3.2: - resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==} - engines: {node: '>=0.6.19'} - string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} - string-width@7.2.0: - resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==} - engines: {node: '>=18'} - - string-width@8.2.1: - resolution: {integrity: sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==} - engines: {node: '>=20'} - string_decoder@1.3.0: resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==} @@ -3003,10 +2842,6 @@ packages: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} - strip-ansi@7.2.0: - resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==} - engines: {node: '>=12'} - strip-json-comments@2.0.1: resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} engines: {node: '>=0.10.0'} @@ -3027,9 +2862,6 @@ packages: resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} engines: {node: '>=10'} - svix@1.90.0: - resolution: {integrity: sha512-ljkZuyy2+IBEoESkIpn8sLM+sxJHQcPxlZFxU+nVDhltNfUMisMBzWX/UR8SjEnzoI28ZjCzMbmYAPwSTucoMw==} - symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} @@ -3167,11 +2999,6 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - uuid@10.0.0: - resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==} - deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028). - hasBin: true - vary@1.1.2: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} engines: {node: '>= 0.8'} @@ -3299,10 +3126,6 @@ packages: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} - wrap-ansi@9.0.2: - resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==} - engines: {node: '>=18'} - wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} @@ -3341,11 +3164,6 @@ packages: yallist@3.1.1: resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} - yaml@2.8.3: - resolution: {integrity: sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==} - engines: {node: '>= 14.6'} - hasBin: true - yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} @@ -3978,8 +3796,6 @@ snapshots: '@rolldown/pluginutils@1.0.0-rc.7': {} - '@stablelib/base64@1.0.1': {} - '@standard-schema/spec@1.1.0': {} '@tailwindcss/node@4.2.2': @@ -4043,12 +3859,12 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.2.2 '@tailwindcss/oxide-win32-x64-msvc': 4.2.2 - '@tailwindcss/vite@4.2.2(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))': + '@tailwindcss/vite@4.2.2(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))': dependencies: '@tailwindcss/node': 4.2.2 '@tailwindcss/oxide': 4.2.2 tailwindcss: 4.2.2 - vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3) + vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0) '@tanstack/eslint-plugin-router@1.161.6(eslint@10.0.3(jiti@2.6.1))(typescript@5.9.3)': dependencies: @@ -4120,7 +3936,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@tanstack/router-plugin@1.167.2(@tanstack/react-router@1.168.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))': + '@tanstack/router-plugin@1.167.2(@tanstack/react-router@1.168.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))': dependencies: '@babel/core': 7.29.0 '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0) @@ -4137,7 +3953,7 @@ snapshots: zod: 3.25.76 optionalDependencies: '@tanstack/react-router': 1.168.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4) - vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3) + vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0) transitivePeerDependencies: - supports-color @@ -4356,12 +4172,12 @@ snapshots: '@typescript-eslint/types': 8.57.1 eslint-visitor-keys: 5.0.1 - '@vitejs/plugin-react@6.0.1(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))': + '@vitejs/plugin-react@6.0.1(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 - vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3) + vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0) - '@vitest/coverage-v8@4.1.0(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)))': + '@vitest/coverage-v8@4.1.0(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)))': dependencies: '@bcoe/v8-coverage': 1.0.2 '@vitest/utils': 4.1.0 @@ -4373,7 +4189,7 @@ snapshots: obug: 2.1.1 std-env: 4.0.0 tinyrainbow: 3.1.0 - vitest: 4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)) + vitest: 4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)) '@vitest/expect@4.1.0': dependencies: @@ -4384,22 +4200,22 @@ snapshots: chai: 6.2.2 tinyrainbow: 3.1.0 - '@vitest/mocker@4.1.0(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))': + '@vitest/mocker@4.1.0(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))': dependencies: '@vitest/spy': 4.1.0 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3) + vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0) optional: true - '@vitest/mocker@4.1.0(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))': + '@vitest/mocker@4.1.0(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))': dependencies: '@vitest/spy': 4.1.0 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3) + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0) '@vitest/pretty-format@4.1.0': dependencies: @@ -4445,20 +4261,12 @@ snapshots: json-schema-traverse: 0.4.1 uri-js: 4.4.1 - ansi-escapes@7.3.0: - dependencies: - environment: 1.1.0 - ansi-regex@5.0.1: {} - ansi-regex@6.2.2: {} - ansi-styles@4.3.0: dependencies: color-convert: 2.0.1 - ansi-styles@6.2.3: {} - ansis@4.2.0: {} anymatch@3.1.3: @@ -4497,7 +4305,7 @@ snapshots: baseline-browser-mapping@2.10.9: {} - better-auth@1.6.2(@opentelemetry/api@1.9.1)(better-sqlite3@12.9.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@24.12.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))): + better-auth@1.6.2(@opentelemetry/api@1.9.1)(better-sqlite3@12.9.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@24.12.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))): dependencies: '@better-auth/core': 1.6.2(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.5(zod@4.3.6))(jose@6.2.2)(kysely@0.28.16)(nanostores@1.2.0) '@better-auth/drizzle-adapter': 1.6.2(@better-auth/core@1.6.2(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.5(zod@4.3.6))(jose@6.2.2)(kysely@0.28.16)(nanostores@1.2.0))(@better-auth/utils@0.4.0)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0)) @@ -4523,12 +4331,12 @@ snapshots: pg: 8.20.0 react: 19.2.4 react-dom: 19.2.4(react@19.2.4) - vitest: 4.1.0(@opentelemetry/api@1.9.1)(@types/node@24.12.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)) + vitest: 4.1.0(@opentelemetry/api@1.9.1)(@types/node@24.12.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)) transitivePeerDependencies: - '@cloudflare/workers-types' - '@opentelemetry/api' - better-auth@1.6.2(@opentelemetry/api@1.9.1)(better-sqlite3@12.9.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3))): + better-auth@1.6.2(@opentelemetry/api@1.9.1)(better-sqlite3@12.9.0)(drizzle-kit@0.31.10)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0))(pg@8.20.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0))): dependencies: '@better-auth/core': 1.6.2(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.5(zod@4.3.6))(jose@6.2.2)(kysely@0.28.16)(nanostores@1.2.0) '@better-auth/drizzle-adapter': 1.6.2(@better-auth/core@1.6.2(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(@opentelemetry/api@1.9.1)(better-call@1.3.5(zod@4.3.6))(jose@6.2.2)(kysely@0.28.16)(nanostores@1.2.0))(@better-auth/utils@0.4.0)(drizzle-orm@0.45.1(@opentelemetry/api@1.9.1)(@types/better-sqlite3@7.6.13)(@types/pg@8.20.0)(better-sqlite3@12.9.0)(kysely@0.28.16)(pg@8.20.0)) @@ -4554,7 +4362,7 @@ snapshots: pg: 8.20.0 react: 19.2.4 react-dom: 19.2.4(react@19.2.4) - vitest: 4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)) + vitest: 4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)) transitivePeerDependencies: - '@cloudflare/workers-types' - '@opentelemetry/api' @@ -4666,15 +4474,6 @@ snapshots: chownr@1.1.4: {} - cli-cursor@5.0.0: - dependencies: - restore-cursor: 5.1.0 - - cli-truncate@5.2.0: - dependencies: - slice-ansi: 8.0.0 - string-width: 8.2.1 - cliui@8.0.1: dependencies: string-width: 4.2.3 @@ -4691,14 +4490,10 @@ snapshots: color-name@1.1.4: {} - colorette@2.0.20: {} - combined-stream@1.0.8: dependencies: delayed-stream: 1.0.0 - commander@14.0.3: {} - component-emitter@1.3.1: {} concurrently@9.2.1: @@ -4808,8 +4603,6 @@ snapshots: electron-to-chromium@1.5.321: {} - emoji-regex@10.6.0: {} - emoji-regex@8.0.0: {} encodeurl@2.0.0: {} @@ -4825,8 +4618,6 @@ snapshots: entities@6.0.1: {} - environment@1.1.0: {} - es-define-property@1.0.1: {} es-errors@1.3.0: {} @@ -5026,17 +4817,10 @@ snapshots: etag@1.8.1: {} - eventemitter3@5.0.4: {} - expand-template@2.0.3: {} expect-type@1.3.0: {} - express-rate-limit@8.4.0(express@5.2.1): - dependencies: - express: 5.2.1 - ip-address: 10.1.0 - express@5.2.1: dependencies: accepts: 2.0.0 @@ -5078,8 +4862,6 @@ snapshots: fast-safe-stringify@2.1.1: {} - fast-sha256@1.3.0: {} - fdir@6.5.0(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 @@ -5148,8 +4930,6 @@ snapshots: get-caller-file@2.0.5: {} - get-east-asian-width@1.5.0: {} - get-intrinsic@1.3.0: dependencies: call-bind-apply-helpers: 1.0.2 @@ -5202,8 +4982,6 @@ snapshots: dependencies: function-bind: 1.1.2 - helmet@8.1.0: {} - hermes-estree@0.25.1: {} hermes-parser@0.25.1: @@ -5226,8 +5004,6 @@ snapshots: statuses: 2.0.2 toidentifier: 1.0.1 - husky@9.1.7: {} - iconv-lite@0.7.2: dependencies: safer-buffer: 2.1.2 @@ -5244,8 +5020,6 @@ snapshots: ini@1.3.8: {} - ip-address@10.1.0: {} - ipaddr.js@1.9.1: {} is-binary-path@2.1.0: @@ -5256,10 +5030,6 @@ snapshots: is-fullwidth-code-point@3.0.0: {} - is-fullwidth-code-point@5.1.0: - dependencies: - get-east-asian-width: 1.5.0 - is-glob@4.0.3: dependencies: is-extglob: 2.1.1 @@ -5391,36 +5161,10 @@ snapshots: lightningcss-win32-arm64-msvc: 1.32.0 lightningcss-win32-x64-msvc: 1.32.0 - lint-staged@16.4.0: - dependencies: - commander: 14.0.3 - listr2: 9.0.5 - picomatch: 4.0.3 - string-argv: 0.3.2 - tinyexec: 1.0.4 - yaml: 2.8.3 - - listr2@9.0.5: - dependencies: - cli-truncate: 5.2.0 - colorette: 2.0.20 - eventemitter3: 5.0.4 - log-update: 6.1.0 - rfdc: 1.4.1 - wrap-ansi: 9.0.2 - locate-path@6.0.0: dependencies: p-locate: 5.0.0 - log-update@6.1.0: - dependencies: - ansi-escapes: 7.3.0 - cli-cursor: 5.0.0 - slice-ansi: 7.1.2 - strip-ansi: 7.2.0 - wrap-ansi: 9.0.2 - lru-cache@11.2.7: {} lru-cache@5.1.1: @@ -5465,8 +5209,6 @@ snapshots: mime@2.6.0: {} - mimic-function@5.0.1: {} - mimic-response@3.1.0: {} minimatch@10.2.4: @@ -5511,10 +5253,6 @@ snapshots: dependencies: wrappy: 1.0.2 - onetime@7.0.0: - dependencies: - mimic-function: 5.0.1 - optionator@0.9.4: dependencies: deep-is: 0.1.4 @@ -5587,8 +5325,6 @@ snapshots: picomatch@4.0.3: {} - postal-mime@2.7.4: {} - postcss@8.5.8: dependencies: nanoid: 3.3.11 @@ -5685,20 +5421,8 @@ snapshots: require-from-string@2.0.2: {} - resend@6.12.2: - dependencies: - postal-mime: 2.7.4 - svix: 1.90.0 - resolve-pkg-maps@1.0.0: {} - restore-cursor@5.1.0: - dependencies: - onetime: 7.0.0 - signal-exit: 4.1.0 - - rfdc@1.4.1: {} - rolldown@1.0.0-rc.10: dependencies: '@oxc-project/types': 0.120.0 @@ -5823,8 +5547,6 @@ snapshots: siginfo@2.0.0: {} - signal-exit@4.1.0: {} - simple-concat@1.0.1: {} simple-get@4.0.1: @@ -5833,21 +5555,6 @@ snapshots: once: 1.4.0 simple-concat: 1.0.1 - slice-ansi@7.1.2: - dependencies: - ansi-styles: 6.2.3 - is-fullwidth-code-point: 5.1.0 - - slice-ansi@8.0.0: - dependencies: - ansi-styles: 6.2.3 - is-fullwidth-code-point: 5.1.0 - - sonner@2.0.7(react-dom@19.2.4(react@19.2.4))(react@19.2.4): - dependencies: - react: 19.2.4 - react-dom: 19.2.4(react@19.2.4) - source-map-js@1.2.1: {} source-map-support@0.5.21: @@ -5867,34 +5574,16 @@ snapshots: stackback@0.0.2: {} - standardwebhooks@1.0.0: - dependencies: - '@stablelib/base64': 1.0.1 - fast-sha256: 1.3.0 - statuses@2.0.2: {} std-env@4.0.0: {} - string-argv@0.3.2: {} - string-width@4.2.3: dependencies: emoji-regex: 8.0.0 is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 - string-width@7.2.0: - dependencies: - emoji-regex: 10.6.0 - get-east-asian-width: 1.5.0 - strip-ansi: 7.2.0 - - string-width@8.2.1: - dependencies: - get-east-asian-width: 1.5.0 - strip-ansi: 7.2.0 - string_decoder@1.3.0: dependencies: safe-buffer: 5.2.1 @@ -5903,10 +5592,6 @@ snapshots: dependencies: ansi-regex: 5.0.1 - strip-ansi@7.2.0: - dependencies: - ansi-regex: 6.2.2 - strip-json-comments@2.0.1: {} superagent@10.3.0: @@ -5939,11 +5624,6 @@ snapshots: dependencies: has-flag: 4.0.0 - svix@1.90.0: - dependencies: - standardwebhooks: 1.0.0 - uuid: 10.0.0 - symbol-tree@3.2.4: {} tailwindcss@4.2.2: {} @@ -6074,11 +5754,9 @@ snapshots: util-deprecate@1.0.2: {} - uuid@10.0.0: {} - vary@1.1.2: {} - vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3): + vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0): dependencies: lightningcss: 1.32.0 picomatch: 4.0.3 @@ -6091,9 +5769,8 @@ snapshots: fsevents: 2.3.3 jiti: 2.6.1 tsx: 4.21.0 - yaml: 2.8.3 - vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3): + vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0): dependencies: lightningcss: 1.32.0 picomatch: 4.0.3 @@ -6106,12 +5783,11 @@ snapshots: fsevents: 2.3.3 jiti: 2.6.1 tsx: 4.21.0 - yaml: 2.8.3 - vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@24.12.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)): + vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@24.12.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)): dependencies: '@vitest/expect': 4.1.0 - '@vitest/mocker': 4.1.0(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)) + '@vitest/mocker': 4.1.0(vite@8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)) '@vitest/pretty-format': 4.1.0 '@vitest/runner': 4.1.0 '@vitest/snapshot': 4.1.0 @@ -6128,7 +5804,7 @@ snapshots: tinyexec: 1.0.4 tinyglobby: 0.2.15 tinyrainbow: 3.1.0 - vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3) + vite: 8.0.1(@types/node@24.12.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0) why-is-node-running: 2.3.0 optionalDependencies: '@opentelemetry/api': 1.9.1 @@ -6138,10 +5814,10 @@ snapshots: - msw optional: true - vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)): + vitest@4.1.0(@opentelemetry/api@1.9.1)(@types/node@25.5.0)(jsdom@29.0.1(@noble/hashes@2.2.0))(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)): dependencies: '@vitest/expect': 4.1.0 - '@vitest/mocker': 4.1.0(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3)) + '@vitest/mocker': 4.1.0(vite@8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)) '@vitest/pretty-format': 4.1.0 '@vitest/runner': 4.1.0 '@vitest/snapshot': 4.1.0 @@ -6158,7 +5834,7 @@ snapshots: tinyexec: 1.0.4 tinyglobby: 0.2.15 tinyrainbow: 3.1.0 - vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0)(yaml@2.8.3) + vite: 8.0.1(@types/node@25.5.0)(esbuild@0.27.4)(jiti@2.6.1)(tsx@4.21.0) why-is-node-running: 2.3.0 optionalDependencies: '@opentelemetry/api': 1.9.1 @@ -6206,12 +5882,6 @@ snapshots: string-width: 4.2.3 strip-ansi: 6.0.1 - wrap-ansi@9.0.2: - dependencies: - ansi-styles: 6.2.3 - string-width: 7.2.0 - strip-ansi: 7.2.0 - wrappy@1.0.2: {} ws@8.20.0: {} @@ -6236,8 +5906,6 @@ snapshots: yallist@3.1.1: {} - yaml@2.8.3: {} - yargs-parser@21.1.1: {} yargs@17.7.2: diff --git a/tsconfig.json b/tsconfig.json index 9e79e86..8b0de56 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,7 @@ { "path": "./packages/db" }, { "path": "./apps/web" }, { "path": "./apps/api" }, - { "path": "./data-pipeline" } + { "path": "./data-pipeline" }, ], - "files": [] + "files": [], }