From 7fa132e09c4d3ab4f7f0281f991bf06a1037273e Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Fri, 28 Nov 2025 13:02:34 +0100 Subject: [PATCH] Update Prisma adapter and type annotations Replaces usage of PrismaBetterSQLite3 with PrismaBetterSqlite3 for consistency and correct casing. Updates type annotations in several components and API router for improved type safety. Also adjusts PrismaClient import paths in db files. --- prisma.config.ts | 5 ++--- src/app/_components/DownloadedScriptsTab.tsx | 2 +- src/app/_components/ScriptsGrid.tsx | 2 +- src/server/api/routers/scripts.ts | 4 ++-- src/server/db.js | 6 +++--- src/server/db.ts | 6 +++--- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/prisma.config.ts b/prisma.config.ts index 93e8eb2..6215f8b 100644 --- a/prisma.config.ts +++ b/prisma.config.ts @@ -2,15 +2,14 @@ import 'dotenv/config' import { defineConfig } from 'prisma/config' export default defineConfig({ - earlyAccess: true, schema: 'prisma/schema.prisma', migrate: { migrations: 'prisma/migrations', }, studio: { adapter: async () => { - const { PrismaBetterSQLite3 } = await import('@prisma/adapter-better-sqlite3') - return new PrismaBetterSQLite3({ url: process.env.DATABASE_URL! }) + const { PrismaBetterSqlite3 } = await import('@prisma/adapter-better-sqlite3') + return new PrismaBetterSqlite3({ url: process.env.DATABASE_URL! }) }, }, }) diff --git a/src/app/_components/DownloadedScriptsTab.tsx b/src/app/_components/DownloadedScriptsTab.tsx index 620c450..bb158c3 100644 --- a/src/app/_components/DownloadedScriptsTab.tsx +++ b/src/app/_components/DownloadedScriptsTab.tsx @@ -164,7 +164,7 @@ export function DownloadedScriptsTab({ // Use Map to deduplicate by slug/name const scriptMap = new Map(); - scriptCardsData.cards?.forEach((script) => { + scriptCardsData.cards?.forEach((script: ScriptCardType) => { if (script?.name && script?.slug) { // Use slug as unique identifier, only keep first occurrence if (!scriptMap.has(script.slug)) { diff --git a/src/app/_components/ScriptsGrid.tsx b/src/app/_components/ScriptsGrid.tsx index e229ce3..42beb0b 100644 --- a/src/app/_components/ScriptsGrid.tsx +++ b/src/app/_components/ScriptsGrid.tsx @@ -169,7 +169,7 @@ export function ScriptsGrid({ onInstallScript }: ScriptsGridProps) { // Use Map to deduplicate by slug/name const scriptMap = new Map(); - scriptCardsData.cards?.forEach((script) => { + scriptCardsData.cards?.forEach((script: ScriptCardType) => { if (script?.name && script?.slug) { // Use slug as unique identifier, only keep first occurrence if (!scriptMap.has(script.slug)) { diff --git a/src/server/api/routers/scripts.ts b/src/server/api/routers/scripts.ts index f8c34bc..abe65d9 100644 --- a/src/server/api/routers/scripts.ts +++ b/src/server/api/routers/scripts.ts @@ -189,7 +189,7 @@ export const scriptsRouter = createTRPCRouter({ } // Enhance cards with category information and additional script data - const cardsWithCategories = cards.map(card => { + const cardsWithCategories = cards.map((card: ScriptCard) => { const script = scripts.find(s => s.slug === card.slug); const categoryNames: string[] = script?.categories?.map(id => categoryMap[id]).filter((name): name is string => typeof name === 'string') ?? []; @@ -226,7 +226,7 @@ export const scriptsRouter = createTRPCRouter({ // Filter cards to only include scripts from enabled repositories // For backward compatibility, include scripts without repository_url - const filteredCards = cardsWithCategories.filter(card => { + const filteredCards = cardsWithCategories.filter((card: ScriptCard) => { const repoUrl = card.repository_url; // If script has no repository_url, include it for backward compatibility diff --git a/src/server/db.js b/src/server/db.js index 89b2c91..4f777f3 100644 --- a/src/server/db.js +++ b/src/server/db.js @@ -1,10 +1,10 @@ import 'dotenv/config' -import { PrismaClient } from '../../prisma/generated/prisma/client.js' -import { PrismaBetterSQLite3 } from '@prisma/adapter-better-sqlite3' +import { PrismaClient } from '../../prisma/generated/prisma' +import { PrismaBetterSqlite3 } from '@prisma/adapter-better-sqlite3' const globalForPrisma = globalThis; -const adapter = new PrismaBetterSQLite3({ url: process.env.DATABASE_URL! }); +const adapter = new PrismaBetterSqlite3({ url: process.env.DATABASE_URL }); export const prisma = globalForPrisma.prisma ?? new PrismaClient({ adapter }); diff --git a/src/server/db.ts b/src/server/db.ts index ccb5894..ba13bb2 100644 --- a/src/server/db.ts +++ b/src/server/db.ts @@ -1,10 +1,10 @@ import 'dotenv/config' -import { PrismaClient } from '../../prisma/generated/prisma/client.js' -import { PrismaBetterSQLite3 } from '@prisma/adapter-better-sqlite3' +import { PrismaClient } from '../../prisma/generated/prisma' +import { PrismaBetterSqlite3 } from '@prisma/adapter-better-sqlite3' const globalForPrisma = globalThis as { prisma?: PrismaClient }; -const adapter = new PrismaBetterSQLite3({ url: process.env.DATABASE_URL! }); +const adapter = new PrismaBetterSqlite3({ url: process.env.DATABASE_URL! }); export const prisma: PrismaClient = globalForPrisma.prisma ?? new PrismaClient({ adapter,