@toa.io/storages.mongodb 1.0.0-alpha.158 → 1.0.0-alpha.161

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/storages.mongodb",
-  "version": "1.0.0-alpha.158",
+  "version": "1.0.0-alpha.161",
   "description": "Toa MongoDB Storage Connector",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -27,5 +27,5 @@
     "openspan": "1.0.0-alpha.93",
     "saslprep": "1.0.3"
   },
-  "gitHead": "958edd392a05ed179e174a10a1c132d4e49daa01"
+  "gitHead": "0777176febf057c5c351bbbc3de02ffad8c37741"
 }

package/src/storage.js

@@ -180,8 +180,8 @@ class Storage extends Connector {
 
     if (this.#entity.unique !== undefined) {
       for (const [name, fields] of Object.entries(this.#entity.unique)) {
-        const sparse = this.checkFields(fields)
-        const unique = await this.uniqueIndex(name, fields, sparse)
+        const optional = this.getOptional(fields)
+        const unique = await this.uniqueIndex(name, fields, optional)
 
         indexes.push(unique)
       }
@@ -193,9 +193,12 @@ class Storage extends Connector {
         const fields = Object.fromEntries(Object.entries(declaration)
           .map(([name, type]) => [name, INDEX_TYPES[type] ?? type]))
 
-        const sparse = this.checkFields(Object.keys(fields))
+        const optional = this.getOptional(Object.keys(fields))
+        const options = { name, sparse: optional.length > 0 }
 
-        await this.#collection.createIndex(fields, { name, sparse })
+        console.info('Creating index', { fields, options })
+
+        await this.#collection.createIndex(fields, options)
           .catch((e) => this.#logs.warn('Index creation failed', { name, fields, error: e }))
 
         indexes.push(name)
@@ -205,7 +208,7 @@ class Storage extends Connector {
     await this.removeObsoleteIndexes(indexes)
   }
 
-  async uniqueIndex (name, properties, sparse = false) {
+  async uniqueIndex (name, properties, optional) {
     const fields = properties.reduce((acc, property) => {
       acc[property] = 1
       return acc
@@ -213,7 +216,14 @@ class Storage extends Connector {
 
     name = 'unique_' + name
 
-    await this.#collection.createIndex(fields, { name, unique: true, sparse })
+    const options = { name, unique: true }
+
+    if (optional.length > 0)
+      options.partialFilterExpression = Object.fromEntries(optional.map((field) => [field, { $exists: true }]))
+
+    console.info('Creating unique index', { name, fields, options })
+
+    await this.#collection.createIndex(fields, options)
       .catch((e) => this.#logs.warn('Unique index creation failed', { name, fields, error: e }))
 
     return name
@@ -240,7 +250,7 @@ class Storage extends Connector {
     }
   }
 
-  checkFields (fields) {
+  getOptional (fields) {
     const optional = []
 
     for (const field of fields) {
@@ -251,12 +261,7 @@ class Storage extends Connector {
         optional.push(field)
     }
 
-    if (optional.length > 0) {
-      this.#logs.info('Index fields are optional, creating sparse index', { fields: optional })
-
-      return true
-    } else
-      return false
+    return optional
   }
 
   debug (method, attributes) {