@toa.io/storages.mongodb 0.20.0-dev.31 → 0.20.0-dev.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/storages.mongodb",
-  "version": "0.20.0-dev.31",
+  "version": "0.20.0-dev.34",
   "description": "Toa MongoDB Storage Connector",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,11 +19,11 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/console": "0.20.0-dev.31",
-    "@toa.io/core": "0.20.0-dev.31",
-    "@toa.io/generic": "0.20.0-dev.31",
-    "@toa.io/pointer": "0.20.0-dev.31",
+    "@toa.io/console": "0.20.0-dev.34",
+    "@toa.io/core": "0.20.0-dev.34",
+    "@toa.io/generic": "0.20.0-dev.34",
+    "@toa.io/pointer": "0.20.0-dev.34",
     "mongodb": "4.13.0"
   },
-  "gitHead": "f9ad6bf2bab1298b96ca52557b7e36b6041cfc88"
+  "gitHead": "7035b1985fe9bb844069308a272d061bfbd38bf0"
 }

package/src/connection.js

@@ -5,40 +5,40 @@
 const { MongoClient } = require('mongodb')
 const { Connector } = require('@toa.io/core')
 const { console } = require('@toa.io/console')
+const { resolve } = require('@toa.io/pointer')
+const { ID } = require('./deployment')
 
-/**
- * @implements {toa.mongodb.Connection}
- */
 class Connection extends Connector {
-  /** @type {toa.mongodb.Pointer} */
-  #pointer
+  #locator
   /** @type {import('mongodb').MongoClient} */
   #client
   /** @type {import('mongodb').Collection<toa.mongodb.Record>} */
   #collection
 
-  /**
-   * @param {toa.mongodb.Pointer} pointer
-   */
-  constructor (pointer) {
+  constructor (locator) {
     super()
 
-    this.#pointer = pointer
-    this.#client = new MongoClient(pointer.reference, OPTIONS)
+    this.#locator = locator
   }
 
   async open () {
+    const urls = await this.#resolveURLs()
+    const db = this.#locator.namespace
+    const collection = this.#locator.name
+
+    this.#client = new MongoClient(urls[0], OPTIONS)
+
     await this.#client.connect()
 
-    this.#collection = this.#client.db(this.#pointer.db).collection(this.#pointer.collection)
+    this.#collection = this.#client.db(db).collection(collection)
 
-    console.info(`Storage Mongo connected to ${this.#pointer.label}/${this.#pointer.db}/${this.#pointer.collection}`)
+    console.info('Storage Mongo connected')
   }
 
   async close () {
     await this.#client.close()
 
-    console.info(`Storage Mongo disconnected from ${this.#pointer.label}/${this.#pointer.db}/${this.#pointer.collection}`)
+    console.info('Storage Mongo disconnected')
   }
 
   /** @hot */
@@ -79,6 +79,11 @@ class Connection extends Connector {
   async update (query, update, options) {
     return this.#collection.findOneAndUpdate(query, update, options)
   }
+
+  async #resolveURLs () {
+    if (process.env.TOA_DEV === '1') return ['mongodb://developer:secret@localhost']
+    else return await resolve(ID, this.#locator.id)
+  }
 }
 
 const OPTIONS = {

package/src/deployment.js

@@ -1,15 +1,22 @@
 'use strict'
 
-const pointer = require('@toa.io/pointer')
+const { createVariables } = require('@toa.io/pointer')
 
-/** @type {toa.deployment.dependency.Constructor} */
 const deployment = (instances, annotation) => {
-  if (annotation === undefined) throw new Error('MongoDB pointer annotation is required')
+  const requests = instances.map((instance) => createRequest(instance))
+  const variables = createVariables(ID, annotation, requests)
 
-  return pointer.deployment(instances, annotation, OPTIONS)
+  return { variables }
 }
 
-/** @type {toa.pointer.deployment.Options} */
-const OPTIONS = { prefix: 'storages-mongodb' }
+function createRequest (instance) {
+  return {
+    group: instance.locator.label,
+    selectors: [instance.locator.id]
+  }
+}
+
+const ID = 'mongodb'
 
+exports.ID = ID
 exports.deployment = deployment

package/src/factory.js

@@ -1,16 +1,11 @@
 'use strict'
 
-const { Pointer } = require('./pointer')
 const { Connection } = require('./connection')
 const { Storage } = require('./storage')
 
-/**
- * @implements {toa.core.storages.Factory}
- */
 class Factory {
   storage (locator) {
-    const pointer = new Pointer(locator)
-    const connection = new Connection(pointer)
+    const connection = new Connection(locator)
 
     return new Storage(connection)
   }

package/src/index.js

@@ -1,9 +1,7 @@
 'use strict'
 
-const { annotation } = require('./annotation')
 const { deployment } = require('./deployment')
 const { Factory } = require('./factory')
 
-exports.annotation = annotation
 exports.deployment = deployment
 exports.Factory = Factory

package/src/annotation.js

@@ -1,5 +0,0 @@
-'use strict'
-
-const { uris } = require('@toa.io/pointer')
-
-exports.annotation = uris.construct

package/src/pointer.js

@@ -1,28 +0,0 @@
-'use strict'
-
-const { Pointer: Base } = require('@toa.io/pointer')
-
-// noinspection JSClosureCompilerSyntax
-/**
- * @implements {toa.mongodb.Pointer}
- */
-class Pointer extends Base {
-  db
-  collection
-
-  /**
-   * @param {toa.core.Locator} locator
-   */
-  constructor (locator) {
-    super(PREFIX, locator, OPTIONS)
-
-    this.db = locator.namespace
-    this.collection = locator.name
-  }
-}
-
-/** @type {toa.pointer.Options} */
-const OPTIONS = { protocol: 'mongodb:' }
-const PREFIX = 'storages-mongodb'
-
-exports.Pointer = Pointer

package/test/annotations.test.js

@@ -1,16 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-
-const mock = { uris: { construct: () => generate() }, Pointer: class {} }
-
-jest.mock('@toa.io/pointer', () => mock)
-const { annotation } = require('../')
-
-it('should export annotations', () => {
-  expect(annotation).toBeDefined()
-})
-
-it('should export connectors.uris.construct', () => {
-  expect(annotation).toStrictEqual(mock.uris.construct)
-})

package/test/deployment.test.js

@@ -1,13 +0,0 @@
-'use strict'
-
-const { deployment } = require('../')
-
-it('should be', () => {
-  expect(deployment).toBeDefined()
-})
-
-it('should throw if annotation is not defined', () => {
-  const instances = []
-
-  expect(() => deployment(instances, undefined)).toThrow('is required')
-})

package/test/factory.fixtures.js

@@ -1,18 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-
-const Connection = jest.fn().mockImplementation(function () {})
-const Storage = jest.fn().mockImplementation(function () {})
-
-/** @type {toa.core.Locator} */ const locator = {
-  name: generate(),
-  namespace: generate(),
-  id: generate(),
-  label: generate(),
-  uppercase: generate().toUpperCase(),
-  hostname: jest.fn(() => generate())
-}
-
-exports.mock = { Connection, Storage }
-exports.locator = locator

package/test/factory.test.js

@@ -1,37 +0,0 @@
-'use strict'
-
-const { encode } = require('@toa.io/generic')
-
-const fixtures = require('./factory.fixtures')
-const mock = fixtures.mock
-
-jest.mock('../src/storage', () => ({ Storage: mock.Storage }))
-jest.mock('../src/connection', () => ({ Connection: mock.Connection }))
-
-const { Factory } = require('../src/')
-
-/** @type {toa.core.storages.Factory} */
-let factory
-
-const uris = { default: 'mongodb://whatever' }
-const value = encode(uris)
-
-process.env.TOA_STORAGES_MONGODB_POINTER = value
-
-beforeEach(() => {
-  factory = new Factory()
-})
-
-it('should create url', () => {
-  factory.storage(fixtures.locator)
-
-  expect(mock.Connection).toHaveBeenCalled()
-
-  const instance = mock.Connection.mock.instances[0]
-  /** @type {toa.mongodb.Pointer} */
-  const pointer = mock.Connection.mock.calls[0][0]
-
-  expect(mock.Storage).toHaveBeenLastCalledWith(instance)
-
-  expect(pointer).toBeDefined()
-})

package/test/pointer.test.js

@@ -1,50 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-const { Locator } = require('@toa.io/core')
-const { encode } = require('@toa.io/generic')
-
-const { Pointer } = require('../src/pointer')
-
-it('should be', () => undefined)
-
-/** @type {toa.core.Locator} */
-let locator
-
-/** @type {toa..Pointer} */
-let pointer
-
-const uris = { default: 'mongodb://whatever' }
-const value = encode(uris)
-
-process.env.TOA_STORAGES_MONGODB_POINTER = value
-
-beforeEach(() => {
-  const name = generate()
-  const namespace = generate()
-
-  locator = new Locator(name, namespace)
-  pointer = new Pointer(locator)
-})
-
-it('should define schema', () => {
-  expect(pointer.protocol).toStrictEqual('mongodb:')
-})
-
-it('should expose db', () => {
-  expect(pointer.db).toStrictEqual(locator.namespace)
-})
-
-it('should expose collection', () => {
-  expect(pointer.collection).toStrictEqual(locator.name)
-})
-
-it('should define schema on local environment', () => {
-  process.env.TOA_DEV = '1'
-
-  expect(() => (pointer = new Pointer(locator))).not.toThrow()
-
-  expect(pointer.protocol).toStrictEqual('mongodb:')
-
-  delete process.env.TOA_DEV
-})