@toa.io/boot 0.20.0-dev.8 → 0.20.0

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@toa.io/boot",
-  "version": "0.20.0-dev.8",
+  "version": "0.20.0",
   "description": "Toa Boot",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
   "main": "src/index.js",
+  "types": "types/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/toa-io/toa.git"
@@ -19,13 +20,13 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "0.20.0-dev.8",
-    "@toa.io/filesystem": "0.20.0-dev.8",
-    "@toa.io/generic": "0.20.0-dev.8",
-    "@toa.io/norm": "0.20.0-dev.8",
-    "@toa.io/schema": "0.20.0-dev.8",
+    "@toa.io/core": "0.20.0",
+    "@toa.io/filesystem": "0.20.0",
+    "@toa.io/generic": "0.20.0",
+    "@toa.io/norm": "0.20.0",
+    "@toa.io/schema": "0.20.0",
     "clone-deep": "4.0.1",
     "dotenv": "16.1.1"
   },
-  "gitHead": "d8c08ec7def70ad93de06541af497cce8c4c1b50"
+  "gitHead": "28fc4b45c224c3683acaaf0e4abd1eb04e07b408"
 }

package/src/bindings/broadcast.js

@@ -2,6 +2,6 @@
 
 const { factory } = require('./factory')
 
-const broadcast = (binding, name, group) => factory(binding).broadcast(name, group)
+const broadcast = (channel, group, binding = '@toa.io/bindings.amqp') => factory(binding).broadcast(channel, group)
 
 exports.broadcast = broadcast

package/src/bindings/receive.js

@@ -2,6 +2,6 @@
 
 const { factory } = require('./factory')
 
-const receive = (binding, source, label, group, receiver) => factory(binding).receiver(source, label, group, receiver)
+const receive = (binding, locator, label, group, receiver) => factory(binding).receiver(locator, label, group, receiver)
 
 exports.receive = receive

package/src/bridge.js

@@ -8,7 +8,7 @@ const algorithm = (bridge, path, endpoint, context) => {
   return algorithm
 }
 
-const event = (bridge, path, label) => resolve(bridge).event(path, label)
+const event = (bridge, path, label, context) => resolve(bridge).event(path, label, context)
 const receiver = (bridge, path, label) => resolve(bridge).receiver(path, label)
 
 const factories = {}

package/src/component.js

@@ -16,7 +16,7 @@ const component = async (manifest) => {
   const locator = new Locator(manifest.name, manifest.namespace)
   const storage = boot.storage(manifest)
   const context = await boot.context(manifest)
-  const emission = boot.emission(manifest.events, locator)
+  const emission = boot.emission(manifest.events, locator, context)
   const schema = new Schema(manifest.entity.schema)
   const entity = new entities.Factory(schema)
   const state = new State(storage, entity, emission, manifest.entity.initialized)

package/src/composition.js

@@ -7,15 +7,9 @@ const boot = require('./index')
 async function composition (paths, options) {
   options = Object.assign({}, options)
 
-  /** @type {toa.norm.Component[]} */
   const manifests = await Promise.all(paths.map((path) => boot.manifest(path, options)))
-
-  /** @type {toa.core.Connector[]} */
   const tenants = await Promise.all(manifests.map(boot.extensions.tenants))
-
   const expositions = await Promise.all(manifests.map(boot.discovery.expose))
-
-  /** @type {toa.core.Component[]} */
   const components = await Promise.all(manifests.map(boot.component))
 
   const producers = components.map((component, index) =>

package/src/emission.js

@@ -5,13 +5,13 @@ const { Emission, Event } = require('@toa.io/core')
 const boot = require('./index')
 const extensions = require('./extensions')
 
-const emission = (definitions, locator) => {
+const emission = (definitions, locator, context) => {
   if (definitions === undefined) return
 
   const events = Object.entries(definitions).map(([label, definition]) => {
     const emitter = boot.bindings.emit(definition.binding, locator, label)
     const decorator = extensions.emitter(emitter, label)
-    const bridge = boot.bridge.event(definition.bridge, definition.path, label)
+    const bridge = boot.bridge.event(definition.bridge, definition.path, label, context)
 
     return new Event(definition, decorator, bridge)
   })

package/src/index.js

@@ -13,7 +13,7 @@ const { exposition } = require('./exposition')
 const { images } = require('./images')
 const { manifest } = require('./manifest')
 const { operation } = require('./operation')
-const { receivers } = require('./receivers')
+const { receivers, receive } = require('./receivers')
 const { remote } = require('./remote')
 const { storage } = require('./storage')
 
@@ -35,6 +35,7 @@ exports.images = images
 exports.manifest = manifest
 exports.operation = operation
 exports.receivers = receivers
+exports.receive = receive
 exports.registry = registry
 exports.remote = remote
 exports.storage = storage

package/src/manifest.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const clone = require('clone-deep')
 const { merge } = require('@toa.io/generic')
 const { component: load } = require('@toa.io/norm')
 const { Locator } = require('@toa.io/core')
@@ -8,7 +9,7 @@ const { Locator } = require('@toa.io/core')
  * @type {toa.boot.Manifest}
  */
 const manifest = async (path, options = {}) => {
-  merge(options, DEFAULTS)
+  options = merge(clone(options), DEFAULTS)
 
   const manifest = await load(path)
 
@@ -31,8 +32,9 @@ const manifest = async (path, options = {}) => {
     }
   }
 
-  if (!('extensions' in manifest)) manifest.extensions = {}
+  if (manifest.extensions === undefined) manifest.extensions = {}
 
+  // add `null` manifests
   for (const extension of options.extensions) {
     if (!(extension in manifest.extensions)) manifest.extensions[extension] = null
   }
@@ -44,9 +46,8 @@ const manifest = async (path, options = {}) => {
   return manifest
 }
 
-/** @type {toa.boot.composition.Options} */
 const DEFAULTS = {
-  extensions: ['@toa.io/extensions.sampling', '@toa.io/extensions.state']
+  extensions: ['@toa.io/extensions.sampling']
 }
 
 exports.manifest = manifest

package/src/manifest.test.js

@@ -0,0 +1,23 @@
+'use strict'
+
+const { generate } = require('randomstring')
+
+jest.mock('@toa.io/norm', () => ({
+  component: () => mockComponent()
+}))
+
+const { manifest } = require('./manifest')
+
+const path = generate()
+
+it('should not modify options', async () => {
+  const options = { extensions: ['foo', 'bar'] }
+
+  await manifest(path, options)
+
+  expect(options.extensions.length).toStrictEqual(2)
+})
+
+function mockComponent () {
+  return { name: generate(), namespace: generate() }
+}

package/src/receivers.js

@@ -9,9 +9,9 @@ const receivers = async (manifest, runtime) => {
   if (manifest.receivers === undefined) return []
 
   const receivers = []
+  const local = await boot.remote(manifest.locator, manifest)
 
   for (const [label, definition] of Object.entries(manifest.receivers)) {
-    const local = await boot.remote(manifest.locator, manifest)
     const bridge = definition.bridge !== undefined ? boot.bridge.receiver(definition.bridge, manifest.path, label) : undefined
     const receiver = new Receiver(definition, local, bridge)
     const decorator = extensions.receiver(receiver, manifest.locator)
@@ -28,6 +28,18 @@ const receivers = async (manifest, runtime) => {
   return receivers
 }
 
+async function receive (label, group, callback) {
+  if (callback === undefined) {
+    callback = group
+    group = undefined
+  }
+
+  const locator = Locator.parse(label)
+  const transport = await resolveBinding(locator, label)
+
+  return boot.bindings.receive(transport, locator, label, group, callback)
+}
+
 /**
  * @param {toa.core.Locator} locator
  * @param {string} label
@@ -42,3 +54,4 @@ async function resolveBinding (locator, label) {
 }
 
 exports.receivers = receivers
+exports.receive = receive

package/types/bindings.d.ts

@@ -0,0 +1,3 @@
+import type { bindings } from '@toa.io/core'
+
+export function broadcast (name: string, group?: string, binding?: string): bindings.Broadcast

package/types/composition.d.ts

@@ -1,20 +1,5 @@
-import * as _core from '@toa.io/core/types'
-
-declare namespace toa.boot {
-
-  namespace composition {
-
-    type Options = {
-      bindings?: string[]
-      storage?: string
-      extensions?: string[]
-    }
-
-  }
-
-  type Composition = (paths: string[], options: composition.Options) => Promise<_core.Connector>
-
+export type Options = {
+  bindings?: string[]
+  storage?: string
+  extensions?: string[]
 }
-
-export type Options = toa.boot.composition.Options
-export type Composition = toa.boot.Composition

package/types/index.d.ts

@@ -1,3 +1,21 @@
-import { Composition } from './composition'
+import * as core from '@toa.io/core'
+import * as composition from './composition'
 
-export const composition: Composition
+export * as bindings from './bindings'
+
+export async function composition (paths: string[], options?: composition.Options): Promise<core.Connector>
+
+export async function remote (locator: core.Locator): Promise<core.Component>
+
+export async function receive<T = any> (
+  label: string,
+  receiver: Receiver,
+): Promise<core.Connector>
+
+export async function receive<T = any> (
+  label: string,
+  group: string | undefined,
+  receiver: Receiver,
+): Promise<core.Connector>
+
+type Receiver = { receive: (message: core.Message<T>) => void | Promise<void> }