Skip to content

Commit c8f01e3

Browse files
authored
chore(db-postgres): enable TypeScript strict (#11560)
1 parent 9ac7a3e commit c8f01e3

3 files changed

Lines changed: 19 additions & 13 deletions

File tree

packages/db-postgres/src/connect.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { DrizzleAdapter } from '@payloadcms/drizzle/types'
2-
import type { Connect, Payload } from 'payload'
2+
import type { Connect, Migration, Payload } from 'payload'
33

44
import { pushDevSchema } from '@payloadcms/drizzle'
55
import { drizzle } from 'drizzle-orm/node-postgres'
@@ -75,15 +75,16 @@ export const connect: Connect = async function connect(
7575
this.payload.logger.info('---- DROPPED TABLES ----')
7676
}
7777
}
78-
} catch (err) {
78+
} catch (error) {
79+
const err = error instanceof Error ? error : new Error(String(error))
7980
if (err.message?.match(/database .* does not exist/i) && !this.disableCreateDatabase) {
8081
// capitalize first char of the err msg
8182
this.payload.logger.info(
8283
`${err.message.charAt(0).toUpperCase() + err.message.slice(1)}, creating...`,
8384
)
8485
const isCreated = await this.createDatabase()
8586

86-
if (isCreated) {
87+
if (isCreated && this.connect) {
8788
await this.connect(options)
8889
return
8990
}
@@ -116,6 +117,6 @@ export const connect: Connect = async function connect(
116117
}
117118

118119
if (process.env.NODE_ENV === 'production' && this.prodMigrations) {
119-
await this.migrate({ migrations: this.prodMigrations })
120+
await this.migrate({ migrations: this.prodMigrations as unknown as Migration[] })
120121
}
121122
}

packages/db-postgres/src/index.ts

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,17 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
7979
if (args.schemaName) {
8080
adapterSchema = pgSchema(args.schemaName)
8181
} else {
82+
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
8283
adapterSchema = { enum: pgEnum, table: pgTable }
8384
}
8485

85-
const extensions = (args.extensions ?? []).reduce((acc, name) => {
86-
acc[name] = true
87-
return acc
88-
}, {})
86+
const extensions = (args.extensions ?? []).reduce(
87+
(acc, name) => {
88+
acc[name] = true
89+
return acc
90+
},
91+
{} as Record<string, boolean>,
92+
)
8993

9094
return createDatabaseAdapter<PostgresAdapter>({
9195
name: 'postgres',
@@ -102,6 +106,7 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
102106
}),
103107
defaultDrizzleSnapshot,
104108
disableCreateDatabase: args.disableCreateDatabase ?? false,
109+
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
105110
drizzle: undefined,
106111
enums: {},
107112
extensions,
@@ -123,9 +128,11 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
123128
logger: args.logger,
124129
operators: operatorMap,
125130
pgSchema: adapterSchema,
131+
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
126132
pool: undefined,
127133
poolOptions: args.pool,
128134
prodMigrations: args.prodMigrations,
135+
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
129136
push: args.push,
130137
relations: {},
131138
relationshipsSuffix: args.relationshipsSuffix || '_rels',
@@ -163,6 +170,7 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
163170
find,
164171
findGlobal,
165172
findGlobalVersions,
173+
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
166174
findOne,
167175
findVersions,
168176
indexes: new Set<string>(),
@@ -180,8 +188,10 @@ export function postgresAdapter(args: Args): DatabaseAdapterObj<PostgresAdapter>
180188
queryDrafts,
181189
rawRelations: {},
182190
rawTables: {},
191+
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
183192
rejectInitializing,
184193
requireDrizzleKit,
194+
// @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
185195
resolveInitializing,
186196
rollbackTransaction,
187197
updateGlobal,

packages/db-postgres/tsconfig.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"extends": "../../tsconfig.base.json",
3-
"compilerOptions": {
4-
/* TODO: remove the following lines */
5-
"strict": false,
6-
"noUncheckedIndexedAccess": false,
7-
},
83
"references": [
94
{
105
"path": "../payload"

0 commit comments

Comments
 (0)