Skip to content

Commit 8e5e23a

Browse files
authored
fix(db-mongodb): type error with prodMigrations (#14394)
Fixes #14374
1 parent 850cc38 commit 8e5e23a

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

packages/db-mongodb/src/connect.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { ConnectOptions } from 'mongoose'
2-
import type { Connect } from 'payload'
2+
import type { Connect, Migration } from 'payload'
33

44
import mongoose from 'mongoose'
55
import { defaultBeginTransaction } from 'payload'
@@ -95,7 +95,7 @@ export const connect: Connect = async function connect(
9595
}
9696

9797
if (process.env.NODE_ENV === 'production' && this.prodMigrations) {
98-
await this.migrate({ migrations: this.prodMigrations })
98+
await this.migrate({ migrations: this.prodMigrations as unknown as Migration[] })
9999
}
100100
} catch (err) {
101101
let msg = `Error: cannot connect to MongoDB.`

packages/db-mongodb/src/index.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import type {
1212
CollectionSlug,
1313
DatabaseAdapterObj,
1414
JsonObject,
15-
Migration,
1615
Payload,
1716
TypeWithVersion,
1817
UpdateGlobalArgs,
@@ -24,7 +23,13 @@ import type {
2423
import mongoose from 'mongoose'
2524
import { createDatabaseAdapter, defaultBeginTransaction, findMigrationDir } from 'payload'
2625

27-
import type { CollectionModel, GlobalModel, MigrateDownArgs, MigrateUpArgs } from './types.js'
26+
import type {
27+
CollectionModel,
28+
GlobalModel,
29+
MigrateDownArgs,
30+
MigrateUpArgs,
31+
MongooseMigration,
32+
} from './types.js'
2833

2934
import { connect } from './connect.js'
3035
import { count } from './count.js'
@@ -136,7 +141,7 @@ export interface Args {
136141
* typed as any to avoid dependency
137142
*/
138143
mongoMemoryServer?: MongoMemoryReplSet
139-
prodMigrations?: Migration[]
144+
prodMigrations?: MongooseMigration[]
140145

141146
transactionOptions?: false | TransactionOptions
142147

packages/db-mongodb/src/types.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
GroupField,
1313
JoinField,
1414
JSONField,
15+
MigrationData,
1516
NumberField,
1617
Payload,
1718
PayloadRequest,
@@ -163,3 +164,8 @@ export type MigrateDownArgs = {
163164
*/
164165
session?: ClientSession
165166
}
167+
168+
export type MongooseMigration = {
169+
down: (args: MigrateDownArgs) => Promise<void>
170+
up: (args: MigrateUpArgs) => Promise<void>
171+
} & MigrationData

0 commit comments

Comments
 (0)