monastery 3.4.2 → 3.5.0

package/test/model.js

@@ -3,11 +3,11 @@ const Model = require('../lib/model.js')
 const monastery = require('../lib/index.js')
 
 let db
-beforeAll(async () => { db = monastery('127.0.0.1/monastery') })
+beforeAll(async () => { db = monastery.manager('127.0.0.1/monastery') })
 afterAll(async () => { db.close() })
 
 test('model > model on manager', async () => {
-  const db2 = monastery('127.0.0.1', { logLevel: 0 })
+  const db2 = monastery.manager('127.0.0.1', { logLevel: 0 })
   db2.model('user', { fields: {} })
   let modelNamedConflict = db2.model('open', { fields: {} })
 
@@ -132,7 +132,7 @@ test('model setup basics', async () => {
 })
 
 test('model setup with default objects', async () => {
-  const db2 = monastery('127.0.0.1/monastery', { defaultObjects: true })
+  const db2 = monastery.manager('127.0.0.1/monastery', { defaultObjects: true })
   let user = db2.model('user', { fields: {
     name: { type: 'string' },
     pets: [{ type: 'string' }],
@@ -376,7 +376,7 @@ test('model setup with messages', async () => {
 
 test('model setup with reserved and invalid rules', async () => {
   // Setup
-  const db2 = monastery('127.0.0.1/monastery', { logLevel: 0 })
+  const db2 = monastery.manager('127.0.0.1/monastery', { logLevel: 0 })
   let user = db2.model('user-model', {
     fields: {
       name: {
@@ -449,12 +449,11 @@ test('model indexes basic', async () => {
 
   // Unique & text index
   let userIndexModel = await db.model('userIndex', {
-    waitForIndexes: true,
     fields: {
       email: { type: 'string', index: 'unique' },
       name: { type: 'string', index: 'text' },
     },
-  })
+  }, { waitForIndexes: true })
 
   let userIndexModelIndexes = await db.db.collection('userIndex').indexes()
   expect(userIndexModelIndexes[0]).toEqual({ 
@@ -504,7 +503,6 @@ test('model indexes unique', async () => {
 
   // Partial unique indexes (allows mulitple null values)
   await db.model('userUniqueIndex', {
-    waitForIndexes: true,
     fields: {
       email: {
         type: 'string',
@@ -516,7 +514,7 @@ test('model indexes unique', async () => {
         },
       },
     },
-  })
+  }, { waitForIndexes: true })
 
   let indexes2 = await db.db.collection('userUniqueIndex').indexes()
   expect(indexes2[0]).toEqual({ 
@@ -648,7 +646,6 @@ test('model indexes 2dsphere', async () => {
   // Setup. The tested model needs to be unique as race condition issue arises when the same model
   // with text indexes are setup at the same time
   await db.model('user99', {
-    waitForIndexes: true,
     fields: {
       location: {
         index: '2dsphere',
@@ -661,7 +658,7 @@ test('model indexes 2dsphere', async () => {
         coordinates: [{ type: 'number' }], // lat, lng
       },
     },
-  })
+  }, { waitForIndexes: true })
 
   // Schema check
   expect(db.user99.fields.location).toEqual({

package/test/plugin-images.js

@@ -7,14 +7,14 @@ const imagePluginFakeOpts = { awsBucket: 'fake', awsRegion: 'fake', awsAccessKey
 let db
 afterAll(async () => { db.close() })
 beforeAll(async () => { 
-  db = monastery('127.0.0.1/monastery', {
+  db = monastery.manager('127.0.0.1/monastery', {
     timestamps: false, 
     imagePlugin: imagePluginFakeOpts,
   }) 
 })
 
 test('images no initialisation', async () => {
-  const db2 = monastery('127.0.0.1/monastery', { timestamps: false })
+  const db2 = monastery.manager('127.0.0.1/monastery', { timestamps: false })
   db2.model('company', {
     fields: {
       logo: { type: 'image' },
@@ -666,7 +666,7 @@ test('images option defaults', async () => {
 })
 
 test('images options formats & filesizes', async () => {
-  const db3 = monastery('127.0.0.1/monastery', {
+  const db3 = monastery.manager('127.0.0.1/monastery', {
     timestamps: false, 
     imagePlugin: { 
       ...imagePluginFakeOpts,
@@ -745,7 +745,7 @@ test('images options formats & filesizes', async () => {
 
 test('images option getSignedUrls', async () => {
   // latest (2022.02)
-  const db3 = monastery('127.0.0.1/monastery', {
+  const db3 = monastery.manager('127.0.0.1/monastery', {
     timestamps: false, 
     imagePlugin: { 
       ...imagePluginFakeOpts,
@@ -778,32 +778,31 @@ test('images option getSignedUrls', async () => {
   })
 
   // Find signed URL via query option
-  // await expect(db3.user.findOne({ query: userInserted._id, getSignedUrls: true })).resolves.toEqual({
-  //   _id: expect.any(Object),
-  //   photos: [imageWithSignedUrl, imageWithSignedUrl],
-  //   photos2: [imageWithSignedUrl, imageWithSignedUrl],
-  // })
-
-  // // Find signed URL via schema option
-  // await expect(db3.user.findOne({ query: userInserted._id })).resolves.toEqual({
-  //   _id: expect.any(Object),
-  //   photos: [image, image],
-  //   photos2: [imageWithSignedUrl, imageWithSignedUrl],
-  // })
+  await expect(db3.user.findOne({ query: userInserted._id, getSignedUrls: true })).resolves.toEqual({
+    _id: expect.any(Object),
+    photos: [imageWithSignedUrl, imageWithSignedUrl],
+    photos2: [imageWithSignedUrl, imageWithSignedUrl],
+  })
+
+  // Find signed URL via schema option
+  await expect(db3.user.findOne({ query: userInserted._id })).resolves.toEqual({
+    _id: expect.any(Object),
+    photos: [image, image],
+    photos2: [imageWithSignedUrl, imageWithSignedUrl],
+  })
 
   // Works with _processAfterFind
   let rawUser = await db3.user._findOne({ _id: userInserted._id })
-  db3.user._processAfterFind(rawUser)
-  // await expect(db3.user._processAfterFind(rawUser)).resolves.toEqual({
-  //   _id: expect.any(Object),
-  //   photos: [image, image],
-  //   photos2: [imageWithSignedUrl, imageWithSignedUrl],
-  // })
+  await expect(db3.user._processAfterFind(rawUser)).resolves.toEqual({
+    _id: expect.any(Object),
+    photos: [image, image],
+    photos2: [imageWithSignedUrl, imageWithSignedUrl],
+  })
   db3.close()
 })
 
 test('images options awsAcl, awsBucket, metadata, params, path', async () => {
-  const db3 = monastery('127.0.0.1/monastery', {
+  const db3 = monastery.manager('127.0.0.1/monastery', {
     timestamps: false, 
     imagePlugin: { 
       ...imagePluginFakeOpts,
@@ -903,7 +902,7 @@ test('images options awsAcl, awsBucket, metadata, params, path', async () => {
 
 test('images option depreciations', async () => {
   // testing (filename bucketDir)
-  const db3 = monastery('127.0.0.1/monastery', {
+  const db3 = monastery.manager('127.0.0.1/monastery', {
     logLevel: 1,
     timestamps: false, 
     imagePlugin: { 

package/test/populate.js

@@ -1,7 +1,7 @@
 const monastery = require('../lib/index.js')
 
 let db
-beforeAll(async () => { db = monastery('127.0.0.1/monastery', { timestamps: false }) })
+beforeAll(async () => { db = monastery.manager('127.0.0.1/monastery', { timestamps: false }) })
 afterAll(async () => { db.close() })
 
 test('model populate', async () => {

package/test/util.js

@@ -254,7 +254,7 @@ test('util > isId', async () => {
   expect(util.isId({})).toEqual(false)
   expect(util.isId(['5ff50fe955da2c00170de734'])).toEqual(false)
   expect(util.isId('5ff50fe955da2c00170de734')).toEqual(true)
-  expect(util.isId(monastery.prototype.id())).toEqual(true)
+  expect(util.isId(monastery.id())).toEqual(true)
 })
 
 test('util > isHex24', async () => {
@@ -265,12 +265,12 @@ test('util > isHex24', async () => {
   expect(util.isHex24({})).toEqual(false)
   expect(util.isHex24(['5ff50fe955da2c00170de734'])).toEqual(false)
   expect(util.isHex24('5ff50fe955da2c00170de734')).toEqual(true)
-  expect(util.isHex24(monastery.prototype.id())).toEqual(true)
+  expect(util.isHex24(monastery.id())).toEqual(true)
 })
 
 
 test('util > arrayWithSchema', async () => {
-  let res = monastery.prototype.arrayWithSchema([{ name: { type: 'string' }}], { minLength: 1 })
+  let res = monastery.arrayWithSchema([{ name: { type: 'string' }}], { minLength: 1 })
   expect(res).toContainEqual({ name: { type: 'string' }})
   expect(res.schema).toEqual({ minLength: 1 })
 })

package/test/validate.js

@@ -3,7 +3,7 @@ const monastery = require('../lib/index.js')
 const Model = require('../lib/model.js')
 
 let db
-beforeAll(async () => { db = monastery('127.0.0.1/monastery', { timestamps: false }) })
+beforeAll(async () => { db = monastery.manager('127.0.0.1/monastery', { timestamps: false }) })
 afterAll(async () => { db.close() })
 
 test('validation basic errors', async () => {
@@ -171,7 +171,7 @@ test('validation type any', async () => {
 })
 
 test('validation schema with reserved and invalid rules', async () => {
-  const db2 = monastery('127.0.0.1/monastery', { logLevel: 0 })
+  const db2 = monastery.manager('127.0.0.1/monastery', { logLevel: 0 })
   let user = db2.model('user-model', {
     fields: {
       sub: {
@@ -972,7 +972,7 @@ test('schema options default', async () => {
 })
 
 test('schema options objects', async () => {
-  const db2 = monastery('127.0.0.1/monastery', { nullObjects: true, timestamps: false })
+  const db2 = monastery.manager('127.0.0.1/monastery', { nullObjects: true, timestamps: false })
   let user = db2.model('user', {
     fields: {
       location: {
@@ -998,7 +998,7 @@ test('schema options objects', async () => {
 })
 
 test('validate defaultObjects', async () => {
-  const db2 = monastery('127.0.0.1/monastery', { defaultObjects: true, timestamps: false })
+  const db2 = monastery.manager('127.0.0.1/monastery', { defaultObjects: true, timestamps: false })
   // let base = { names: [], animals: { dogs: [] }}
   let user = db2.model('user', { fields: {
     name: { type: 'string' },
@@ -1018,7 +1018,7 @@ test('validate defaultObjects', async () => {
 })
 
 test('validate nullObjects', async () => {
-  const db2 = monastery('127.0.0.1/monastery', { nullObjects: true, timestamps: false })
+  const db2 = monastery.manager('127.0.0.1/monastery', { nullObjects: true, timestamps: false })
   let user = db2.model('user', { fields: {
     names: [{ type: 'string' }],
     animals: {

package/test/virtuals.js

@@ -1,7 +1,7 @@
 const monastery = require('../lib/index.js')
 
 let db
-beforeAll(async () => { db = monastery('127.0.0.1/monastery', { timestamps: false }) })
+beforeAll(async () => { db = monastery.manager('127.0.0.1/monastery', { timestamps: false }) })
 afterAll(async () => { db.close() })
 
 test('virtuals', async () => {