chore(db-postgres): enable TypeScript strict (#11560)

This commit is contained in:
Germán Jabloñski
2025-03-10 18:12:20 -03:00
committed by GitHub
parent 9ac7a3ed49
commit c8f01e31a1
3 changed files with 19 additions and 13 deletions

View File

@@ -1,5 +1,5 @@
import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
import type { Connect, Payload } from 'payload'
import type { Connect, Migration, Payload } from 'payload'
import { pushDevSchema } from '@payloadcms/drizzle'
import { drizzle } from 'drizzle-orm/node-postgres'
@@ -75,7 +75,8 @@ export const connect: Connect = async function connect(
this.payload.logger.info('---- DROPPED TABLES ----')
}
}
} catch (err) {
} catch (error) {
const err = error instanceof Error ? error : new Error(String(error))
if (err.message?.match(/database .* does not exist/i) && !this.disableCreateDatabase) {
// capitalize first char of the err msg
this.payload.logger.info(
@@ -83,7 +84,7 @@ export const connect: Connect = async function connect(
)
const isCreated = await this.createDatabase()
if (isCreated) {
if (isCreated && this.connect) {
await this.connect(options)
return
}
@@ -116,6 +117,6 @@ export const connect: Connect = async function connect(
}
if (process.env.NODE_ENV === 'production' && this.prodMigrations) {
await this.migrate({ migrations: this.prodMigrations })
await this.migrate({ migrations: this.prodMigrations as unknown as Migration[] })
}
}

View File

@@ -79,13 +79,17 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
if (args.schemaName) {
adapterSchema = pgSchema(args.schemaName)
} else {
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
adapterSchema = { enum: pgEnum, table: pgTable }
}
const extensions = (args.extensions ?? []).reduce((acc, name) => {
acc[name] = true
return acc
}, {})
const extensions = (args.extensions ?? []).reduce(
(acc, name) => {
acc[name] = true
return acc
},
{} as Record<string, boolean>,
)
return createDatabaseAdapter<PostgresAdapter>({
name: 'postgres',
@@ -102,6 +106,7 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
}),
defaultDrizzleSnapshot,
disableCreateDatabase: args.disableCreateDatabase ?? false,
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
drizzle: undefined,
enums: {},
extensions,
@@ -123,9 +128,11 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
logger: args.logger,
operators: operatorMap,
pgSchema: adapterSchema,
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
pool: undefined,
poolOptions: args.pool,
prodMigrations: args.prodMigrations,
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
push: args.push,
relations: {},
relationshipsSuffix: args.relationshipsSuffix || '_rels',
@@ -163,6 +170,7 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
find,
findGlobal,
findGlobalVersions,
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
findOne,
findVersions,
indexes: new Set<string>(),
@@ -180,8 +188,10 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
queryDrafts,
rawRelations: {},
rawTables: {},
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
rejectInitializing,
requireDrizzleKit,
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
resolveInitializing,
rollbackTransaction,
updateGlobal,

View File

@@ -1,10 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
/* TODO: remove the following lines */
"strict": false,
"noUncheckedIndexedAccess": false,
},
"references": [
{
"path": "../payload"