@toa.io/storages.mongodb 1.0.0-alpha.12 → 1.0.0-alpha.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/storages.mongodb",
-  "version": "1.0.0-alpha.12",
+  "version": "1.0.0-alpha.14",
   "description": "Toa MongoDB Storage Connector",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,13 +19,13 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/console": "1.0.0-alpha.12",
-    "@toa.io/conveyor": "1.0.0-alpha.12",
-    "@toa.io/core": "1.0.0-alpha.12",
-    "@toa.io/generic": "1.0.0-alpha.12",
-    "@toa.io/pointer": "1.0.0-alpha.12",
+    "@toa.io/console": "1.0.0-alpha.14",
+    "@toa.io/conveyor": "1.0.0-alpha.14",
+    "@toa.io/core": "1.0.0-alpha.14",
+    "@toa.io/generic": "1.0.0-alpha.14",
+    "@toa.io/pointer": "1.0.0-alpha.14",
     "mongodb": "6.3.0",
     "saslprep": "1.0.3"
   },
-  "gitHead": "897206fbcf724fa88f427b6aee35bff571b2a3a1"
+  "gitHead": "8aa52cb97021695885c8dbe64beca26c9665fc8f"
 }

package/src/client.js

@@ -57,17 +57,17 @@ class Client extends Connector {
    */
   async open () {
     const urls = await this.resolveURLs()
+    const db = this.resolveDB()
+    const collection = this.locator.lowercase
 
-    this.key = getKey(urls)
+    this.key = getKey(db, urls)
 
     INSTANCES[this.key] ??= this.createInstance(urls)
 
     this.instance = await INSTANCES[this.key]
     this.instance.count++
 
-    this.collection = this.instance.client
-      .db(this.locator.namespace)
-      .collection(this.locator.name)
+    this.collection = this.instance.client.db(db).collection(collection)
   }
 
   /**
@@ -116,10 +116,26 @@ class Client extends Connector {
       return await resolve(ID, this.locator.id)
     }
   }
+
+  /**
+   * @private
+   * @return {string}
+   */
+  resolveDB () {
+    if (process.env.TOA_CONTEXT !== undefined) {
+      return process.env.TOA_CONTEXT
+    }
+
+    if (process.env.TOA_DEV === '1') {
+      return 'toa-dev'
+    }
+
+    throw new Error('Environment variable TOA_CONTEXT is not defined')
+  }
 }
 
-function getKey (urls) {
-  return urls.sort().join(' ')
+function getKey (db, urls) {
+  return db + ':' + urls.sort().join(' ')
 }
 
 const OPTIONS = {

package/src/storage.js

@@ -44,6 +44,7 @@ class Storage extends Connector {
       criteria,
       options
     } = translate(query)
+
     const recordset = await this.#connection.find(criteria, options)
 
     return recordset.map((item) => from(item))
@@ -75,38 +76,38 @@ class Storage extends Connector {
       }
     } catch (error) {
       if (error.code === ERR_DUPLICATE_KEY) {
-        return new exceptions.DuplicateException(Object.keys(error.keyValue))
+
+        const id = error.keyPattern === undefined
+          ? error.message.includes(' index: _id_ ') // AWS DocumentDB
+          : error.keyPattern._id === 1
+
+        if (id) {
+          return false
+        } else {
+          throw new exceptions.DuplicateException()
+        }
       } else {
         throw error
       }
     }
   }
 
-  async upsert (query, changeset, insert) {
+  async upsert (query, changeset) {
     const {
       criteria,
       options
     } = translate(query)
 
+    if (!('_deleted' in changeset) || changeset._deleted === null) {
+      delete criteria._deleted
+      changeset._deleted = null
+    }
+
     const update = {
       $set: { ...changeset },
       $inc: { _version: 1 }
     }
 
-    if (insert !== undefined) {
-      delete insert._version
-
-      options.upsert = true
-
-      if (criteria._id !== undefined) {
-        insert._id = criteria._id
-      } else {
-        return null
-      } // this shouldn't ever happen
-
-      if (Object.keys(insert) > 0) update.$setOnInsert = insert
-    }
-
     options.returnDocument = 'after'
 
     const result = await this.#connection.update(criteria, update, options)

package/src/translate.js

@@ -7,12 +7,20 @@ const parse = { ...require('./translate/criteria'), ...require('./translate/opti
  * @returns {{criteria: Object, options: Object}}
  */
 const translate = (query) => {
-  const result = { criteria: {}, options: {} }
+  const result = {
+    criteria: query?.criteria === undefined ? {} : parse.criteria(query.criteria),
+    options: query?.options === undefined ? {} : parse.options(query.options)
+  }
 
-  if (query.criteria !== undefined) result.criteria = parse.criteria(query.criteria)
-  if (query.options !== undefined) result.options = parse.options(query.options)
-  if (query.id !== undefined) result.criteria._id = query.id
-  if (query.version !== undefined) result.criteria._version = query.version
+  if (query?.id !== undefined) {
+    result.criteria._id = query.id
+  }
+
+  if (query?.version !== undefined) {
+    result.criteria._version = query.version
+  }
+
+  result.criteria._deleted = null
 
   return result
 }