The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
chore: tidy code
Mythie3d81b15d71ef
diff --git a/package-lock.json b/package-lock.jsonindex 6f86cfb5f..81805cbd7 100644--- a/package-lock.json+++ b/package-lock.json@@ -2211,6 +2211,11 @@"integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==","optional": true},+ "node_modules/@epic-web/remember": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/@epic-web/remember/-/remember-1.0.2.tgz",+ "integrity": "sha512-K7DcGoRPqVkjVhPEMQzqw7W/c3hq/3LuiI74he6SkXwR6A49aUmXpxmdb6o+NldY4FFtG42U7nL8PrqNGRxXuQ=="+ },"node_modules/@esbuild-plugins/node-resolve": {"version": "0.1.4","resolved": "https://registry.npmjs.org/@esbuild-plugins/node-resolve/-/node-resolve-0.1.4.tgz",@@ -13999,9 +14004,9 @@}},"node_modules/get-tsconfig": {- "version": "4.7.2",- "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",- "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",+ "version": "4.7.5",+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz",+ "integrity": "sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==","dependencies": {"resolve-pkg-maps": "^1.0.0"},@@ -23441,6 +23446,431 @@"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==","dev": true},+ "node_modules/tsx": {+ "version": "4.11.0",+ "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.11.0.tgz",+ "integrity": "sha512-vzGGELOgAupsNVssAmZjbUDfdm/pWP4R+Kg8TVdsonxbXk0bEpE1qh0yV6/QxUVXaVlNemgcPajGdJJ82n3stg==",+ "dev": true,+ "dependencies": {+ "esbuild": "~0.20.2",+ "get-tsconfig": "^4.7.5"+ },+ "bin": {+ "tsx": "dist/cli.mjs"+ },+ "engines": {+ "node": ">=18.0.0"+ },+ "optionalDependencies": {+ "fsevents": "~2.3.3"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/aix-ppc64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",+ "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",+ "cpu": [+ "ppc64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "aix"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/android-arm": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",+ "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",+ "cpu": [+ "arm"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/android-arm64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",+ "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/android-x64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",+ "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",+ "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/darwin-x64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",+ "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",+ "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",+ "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-arm": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",+ "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",+ "cpu": [+ "arm"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-arm64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",+ "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-ia32": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",+ "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",+ "cpu": [+ "ia32"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-loong64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",+ "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",+ "cpu": [+ "loong64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",+ "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",+ "cpu": [+ "mips64el"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",+ "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",+ "cpu": [+ "ppc64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",+ "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",+ "cpu": [+ "riscv64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-s390x": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",+ "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",+ "cpu": [+ "s390x"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-x64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",+ "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",+ "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "netbsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",+ "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "openbsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/sunos-x64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",+ "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "sunos"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/win32-arm64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",+ "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/win32-ia32": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",+ "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",+ "cpu": [+ "ia32"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/win32-x64": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",+ "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsx/node_modules/esbuild": {+ "version": "0.20.2",+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",+ "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",+ "dev": true,+ "hasInstallScript": true,+ "bin": {+ "esbuild": "bin/esbuild"+ },+ "engines": {+ "node": ">=12"+ },+ "optionalDependencies": {+ "@esbuild/aix-ppc64": "0.20.2",+ "@esbuild/android-arm": "0.20.2",+ "@esbuild/android-arm64": "0.20.2",+ "@esbuild/android-x64": "0.20.2",+ "@esbuild/darwin-arm64": "0.20.2",+ "@esbuild/darwin-x64": "0.20.2",+ "@esbuild/freebsd-arm64": "0.20.2",+ "@esbuild/freebsd-x64": "0.20.2",+ "@esbuild/linux-arm": "0.20.2",+ "@esbuild/linux-arm64": "0.20.2",+ "@esbuild/linux-ia32": "0.20.2",+ "@esbuild/linux-loong64": "0.20.2",+ "@esbuild/linux-mips64el": "0.20.2",+ "@esbuild/linux-ppc64": "0.20.2",+ "@esbuild/linux-riscv64": "0.20.2",+ "@esbuild/linux-s390x": "0.20.2",+ "@esbuild/linux-x64": "0.20.2",+ "@esbuild/netbsd-x64": "0.20.2",+ "@esbuild/openbsd-x64": "0.20.2",+ "@esbuild/sunos-x64": "0.20.2",+ "@esbuild/win32-arm64": "0.20.2",+ "@esbuild/win32-ia32": "0.20.2",+ "@esbuild/win32-x64": "0.20.2"+ }+ },"node_modules/turbo": {"version": "1.10.16","resolved": "https://registry.npmjs.org/turbo/-/turbo-1.10.16.tgz",@@ -26775,6 +27205,7 @@"zod": "^3.22.4"},"devDependencies": {+ "@playwright/browser-chromium": "1.43.0","@types/luxon": "^3.3.1","@types/pg": "^8.11.4"}@@ -26832,6 +27263,7 @@"version": "1.0.0","license": "MIT","dependencies": {+ "@epic-web/remember": "1.0.2","@prisma/client": "5.4.2","kysely": "^0.27.3","prisma": "5.4.2",@@ -26842,7 +27274,7 @@"dotenv": "^16.3.1","dotenv-cli": "^7.3.0","prisma-kysely": "^1.8.0",- "ts-node": "^10.9.1",+ "tsx": "^4.11.0","typescript": "5.2.2"}},diff --git a/package.json b/package.jsonindex 3480aae28..7f08e8697 100644--- a/package.json+++ b/package.json@@ -19,6 +19,7 @@"prisma:generate": "npm run with:env -- npm run prisma:generate -w @documenso/prisma","prisma:migrate-dev": "npm run with:env -- npm run prisma:migrate-dev -w @documenso/prisma","prisma:migrate-deploy": "npm run with:env -- npm run prisma:migrate-deploy -w @documenso/prisma",+ "prisma:migrate-reset": "npm run with:env -- npm run prisma:migrate-reset -w @documenso/prisma","prisma:seed": "npm run with:env -- npm run prisma:seed -w @documenso/prisma","prisma:studio": "npm run with:env -- npm run prisma:studio -w @documenso/prisma","with:env": "dotenv -e .env -e .env.local --",@@ -60,4 +61,4 @@"next": "14.0.3"}}-}\ No newline at end of file+}diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.tsindex 29b05e09c..6805eedbe 100644--- a/packages/lib/next-auth/auth-options.ts+++ b/packages/lib/next-auth/auth-options.ts@@ -1,5 +1,5 @@/// <reference types="../types/next-auth.d.ts" />-import { KyselyAdapter } from '@auth/kysely-adapter';+import { PrismaAdapter } from '@next-auth/prisma-adapter';import { compare } from '@node-rs/bcrypt';import { verifyAuthenticationResponse } from '@simplewebauthn/server';import { DateTime } from 'luxon';@@ -24,11 +24,9 @@ import { ZAuthenticationResponseJSONSchema } from '../types/webauthn';import { extractNextAuthRequestMetadata } from '../universal/extract-request-metadata';import { getAuthenticatorOptions } from '../utils/authenticator';import { ErrorCode } from './error-codes';-import { db } from './kysely-db/db';export const NEXT_AUTH_OPTIONS: AuthOptions = {- //@ts-expect-error - https://github.com/nextauthjs/next-auth/issues/8660- adapter: KyselyAdapter(db),+ adapter: PrismaAdapter(prisma),secret: process.env.NEXTAUTH_SECRET ?? 'secret',session: {strategy: 'jwt',diff --git a/packages/lib/next-auth/kysely-db/db.ts b/packages/lib/next-auth/kysely-db/db.tsdeleted file mode 100644index 6f6f78ef9..000000000--- a/packages/lib/next-auth/kysely-db/db.ts+++ /dev/null@@ -1,14 +0,0 @@-import { KyselyAuth } from '@auth/kysely-adapter';-import type { Codegen } from '@auth/kysely-adapter';-import { PostgresDialect } from 'kysely';-import { Pool } from 'pg';--import type { DB } from '@documenso/prisma/generated/types';--export const db = new KyselyAuth<DB, Codegen>({- dialect: new PostgresDialect({- pool: new Pool({- connectionString: process.env.DATABASE_URL,- }),- }),-});diff --git a/packages/lib/package.json b/packages/lib/package.jsonindex e5678c604..341bc53aa 100644--- a/packages/lib/package.json+++ b/packages/lib/package.json@@ -51,7 +51,7 @@},"devDependencies": {"@types/luxon": "^3.3.1",- "@types/pg": "^8.11.4"+ "@types/pg": "^8.11.4","@playwright/browser-chromium": "1.43.0"}-}\ No newline at end of file+}diff --git a/packages/lib/server-only/user/get-monthly-completed-document.ts b/packages/lib/server-only/user/get-monthly-completed-document.tsindex 644643bb3..fcc23622c 100644--- a/packages/lib/server-only/user/get-monthly-completed-document.ts+++ b/packages/lib/server-only/user/get-monthly-completed-document.ts@@ -1,6 +1,8 @@+import { sql } from 'kysely';import { DateTime } from 'luxon';-import { prisma } from '@documenso/prisma';+import { kyselyPrisma } from '@documenso/prisma';+import { DocumentStatus } from '@documenso/prisma/client';export type GetCompletedDocumentsMonthlyResult = Array<{month: string;@@ -8,24 +10,27 @@ export type GetCompletedDocumentsMonthlyResult = Array<{cume_count: number;}>;-type GetCompletedDocumentsMonthlyQueryResult = Array<{- month: Date;- count: bigint;- cume_count: bigint;-}>;-export const getCompletedDocumentsMonthly = async () => {- const result = await prisma.$queryRaw<GetCompletedDocumentsMonthlyQueryResult>`- SELECT- DATE_TRUNC('month', "updatedAt") AS "month",- COUNT("id") as "count",- SUM(COUNT("id")) OVER (ORDER BY DATE_TRUNC('month', "updatedAt")) as "cume_count"- FROM "Document"- WHERE "status" = 'COMPLETED'- GROUP BY "month"- ORDER BY "month" DESC- LIMIT 12- `;+ const qb = kyselyPrisma.$kysely+ .selectFrom('Document')+ .select(({ fn, ref }) => [+ fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), ref('Document.updatedAt')]).as('month'),+ fn.count('id').as('count'),+ fn+ .sum(fn.count('id'))+ // Feels like a bug in the Kysely extension but I just can not do this orderBy in a type-safe manner+ // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any+ .over((ob) =>+ ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), ref('Document.updatedAt')]) as any),+ )+ .as('cume_count'),+ ])+ .where(() => sql`"Document"."status" = ${DocumentStatus.COMPLETED}::"DocumentStatus"`)+ .groupBy('month')+ .orderBy('month', 'desc')+ .limit(12);++ const result = await qb.execute();return result.map((row) => ({month: DateTime.fromJSDate(row.month).toFormat('yyyy-MM'),diff --git a/packages/prisma/.gitignore b/packages/prisma/.gitignorenew file mode 100644index 000000000..9ab870da8--- /dev/null+++ b/packages/prisma/.gitignore@@ -0,0 +1 @@+generated/diff --git a/packages/prisma/index.ts b/packages/prisma/index.tsindex a9bbc2e65..b245d1483 100644--- a/packages/prisma/index.ts+++ b/packages/prisma/index.ts@@ -1,38 +1,31 @@+import { remember } from '@epic-web/remember';import { PrismaClient } from '@prisma/client';import { Kysely, PostgresAdapter, PostgresIntrospector, PostgresQueryCompiler } from 'kysely';import kyselyExtension from 'prisma-extension-kysely';-import type { DB } from './generated/types.js';+import type { DB } from './generated/types';import { getDatabaseUrl } from './helper';-declare global {- // We need `var` to declare a global variable in TypeScript- // eslint-disable-next-line no-var- var prisma: PrismaClient | undefined;-}--if (!globalThis.prisma) {- globalThis.prisma = new PrismaClient({ datasourceUrl: getDatabaseUrl() });-}--const _prisma =- globalThis.prisma ||- new PrismaClient({- datasourceUrl: getDatabaseUrl(),- });--export const prisma = _prisma.$extends(- kyselyExtension({- kysely: (driver) =>- new Kysely<DB>({- dialect: {- createAdapter: () => new PostgresAdapter(),- createDriver: () => driver,- createIntrospector: (db) => new PostgresIntrospector(db),- createQueryCompiler: () => new PostgresQueryCompiler(),- },- }),- }),+export const prisma = remember(+ 'prisma',+ () =>+ new PrismaClient({+ datasourceUrl: getDatabaseUrl(),+ }),);-export const getPrismaClient = () => prisma;+export const kyselyPrisma = remember('kyselyPrisma', () =>+ prisma.$extends(+ kyselyExtension({+ kysely: (driver) =>+ new Kysely<DB>({+ dialect: {+ createAdapter: () => new PostgresAdapter(),+ createDriver: () => driver,+ createIntrospector: (db) => new PostgresIntrospector(db),+ createQueryCompiler: () => new PostgresQueryCompiler(),+ },+ }),+ }),+ ),+);diff --git a/packages/prisma/package.json b/packages/prisma/package.jsonindex 76c6f0e0f..7cb8a3235 100644--- a/packages/prisma/package.json+++ b/packages/prisma/package.json@@ -12,13 +12,15 @@"prisma:generate": "prisma generate","prisma:migrate-dev": "prisma migrate dev --skip-seed","prisma:migrate-deploy": "prisma migrate deploy",+ "prisma:migrate-reset": "prisma migrate reset","prisma:seed": "prisma db seed","prisma:studio": "prisma studio"},"prisma": {- "seed": "ts-node --transpileOnly --project ./tsconfig.seed.json ./seed-database.ts"+ "seed": "tsx ./seed-database.ts"},"dependencies": {+ "@epic-web/remember": "1.0.2","@prisma/client": "5.4.2","kysely": "^0.27.3","prisma": "5.4.2",@@ -29,7 +31,7 @@"dotenv": "^16.3.1","dotenv-cli": "^7.3.0","prisma-kysely": "^1.8.0",- "ts-node": "^10.9.1",+ "tsx": "^4.11.0","typescript": "5.2.2"}}diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prismaindex 3c33f84aa..fca01f568 100644--- a/packages/prisma/schema.prisma+++ b/packages/prisma/schema.prisma@@ -2,6 +2,10 @@ generator kysely {provider = "prisma-kysely"}+generator client {+ provider = "prisma-client-js"+}+datasource db {provider = "postgresql"url = env("NEXT_PRIVATE_DATABASE_URL")