Skip to content

feat(chore): optimize code and remove deprecated options in mongo #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2023
Merged

feat(chore): optimize code and remove deprecated options in mongo #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ const fp = require('fastify-plugin')
const { MongoClient, ObjectId } = require('mongodb')

function decorateFastifyInstance (fastify, client, options) {
const forceClose = options.forceClose
const databaseName = options.database
const name = options.name
const newClient = options.newClient
const { forceClose, database, name, newClient } = options

if (newClient) {
// done() is not needed because .close() returns a Promise
Expand Down Expand Up @@ -35,8 +32,8 @@ function decorateFastifyInstance (fastify, client, options) {
}
}

if (databaseName) {
mongo.db = client.db(databaseName)
if (database) {
mongo.db = client.db(database)
}

if (!fastify.mongo) {
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@
"database",
"connection"
],
"author": "Tomas Della Vedova - @delvedor (http://delved.org)",
"author": "Tomas Della Vedova - @delvedor (https://delvedor.dev)",
"license": "MIT",
"bugs": {
"url": "https://github.com/fastify/fastify-mongodb/issues"
},
"homepage": "https://github.com/fastify/fastify-mongodb#readme",
"devDependencies": {
"@fastify/pre-commit": "^2.0.2",
"@types/node": "^20.1.0",
"fastify": "^4.0.0",
"standard": "^17.0.0",
"@types/node": "^20.6.2",
"fastify": "^4.23.2",
"standard": "^17.1.0",
"tap": "^16.1.0",
"tsd": "^0.29.0"
},
"dependencies": {
"fastify-plugin": "^4.0.0",
"mongodb": "^6.0.0"
"fastify-plugin": "^4.5.1",
"mongodb": "^6.1.0"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 5 additions & 5 deletions test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ test('{ url: MONGODB_URL, database: ANOTHER_DATABASE_NAME }', async (t) => {
test('{ client: client }', async (t) => {
t.plan(6)

const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL, { useNewUrlParser: true, useUnifiedTopology: true })
const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL)
t.teardown(client.close.bind(client))

const fastify = await register(t, { client })
Expand All @@ -243,7 +243,7 @@ test('{ client: client }', async (t) => {
test('{ client: client, database: DATABASE_NAME }', async (t) => {
t.plan(8)

const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL, { useNewUrlParser: true, useUnifiedTopology: true })
const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL)
t.teardown(client.close.bind(client))

const fastify = await register(t, { client, database: ANOTHER_DATABASE_NAME })
Expand All @@ -261,7 +261,7 @@ test('{ client: client, database: DATABASE_NAME }', async (t) => {
test('{ client: client, name: CLIENT_NAME }', async (t) => {
t.plan(11)

const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL, { useNewUrlParser: true, useUnifiedTopology: true })
const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL)
t.teardown(client.close.bind(client))

const fastify = await register(t, { client, name: CLIENT_NAME })
Expand All @@ -284,7 +284,7 @@ test('{ client: client, name: CLIENT_NAME }', async (t) => {
test('{ client: client, name: CLIENT_NAME, database: ANOTHER_DATABASE_NAME }', async (t) => {
t.plan(15)

const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL, { useNewUrlParser: true, useUnifiedTopology: true })
const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL)
t.teardown(client.close.bind(client))

const fastify = await register(t, { client, name: CLIENT_NAME, database: ANOTHER_DATABASE_NAME })
Expand All @@ -309,7 +309,7 @@ test('{ client: client, name: CLIENT_NAME, database: ANOTHER_DATABASE_NAME }', a
})

test('{ client: client } does not set onClose', async (t) => {
const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL, { useNewUrlParser: true, useUnifiedTopology: true })
const client = await mongodb.MongoClient.connect(NO_DATABASE_MONGODB_URL)
t.teardown(client.close.bind(client))

const fastify = Fastify()
Expand Down