@toa.io/boot 1.0.0-alpha.7 → 1.0.0-alpha.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/boot",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.75",
   "description": "Toa Boot",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -20,13 +20,14 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "1.0.0-alpha.7",
-    "@toa.io/filesystem": "1.0.0-alpha.7",
-    "@toa.io/generic": "1.0.0-alpha.7",
-    "@toa.io/norm": "1.0.0-alpha.7",
-    "@toa.io/schema": "1.0.0-alpha.7",
+    "@toa.io/core": "1.0.0-alpha.75",
+    "@toa.io/filesystem": "1.0.0-alpha.63",
+    "@toa.io/generic": "1.0.0-alpha.63",
+    "@toa.io/norm": "1.0.0-alpha.75",
+    "@toa.io/schemas": "1.0.0-alpha.63",
     "clone-deep": "4.0.1",
-    "dotenv": "16.1.1"
+    "dotenv": "16.1.1",
+    "openspan": "1.0.0-alpha.73"
   },
-  "gitHead": "4f5ac0bc342d4b7bd469fbe5c74266f050b55c9f"
+  "gitHead": "5050fff4a676bbcd7b6f89c1788411701b7ecba6"
 }

package/src/bridge.js

@@ -1,7 +1,8 @@
 'use strict'
 
-const algorithm = (bridge, path, endpoint, context) => {
-  const algorithm = resolve(bridge).algorithm(path, endpoint, context)
+async function algorithm (bridge, path, endpoint, context) {
+  const factory = resolve(bridge)
+  const algorithm = await factory.algorithm(path, endpoint, context)
 
   algorithm.depends(context)
 

package/src/cascade.js

@@ -4,13 +4,13 @@ const { Cascade } = require('@toa.io/core')
 
 const boot = require('./index')
 
-const cascade = (manifest, endpoint, definition, context) => {
+async function cascade (manifest, endpoint, definition, context) {
   const bridges = []
 
   if (definition.forward) endpoint = definition.forward
 
   if (definition.bridge) {
-    const bridge = boot.bridge.algorithm(definition.bridge, manifest.path, endpoint, context)
+    const bridge = await boot.bridge.algorithm(definition.bridge, manifest.path, endpoint, context)
 
     bridges.unshift(bridge)
   }
@@ -22,7 +22,7 @@ const cascade = (manifest, endpoint, definition, context) => {
 
     if (operation === undefined) continue
 
-    const bridge = boot.bridge.algorithm(operation.bridge, prototype.path, endpoint, context)
+    const bridge = await boot.bridge.algorithm(operation.bridge, prototype.path, endpoint, context)
 
     bridges.unshift(bridge)
   }

package/src/component.js

@@ -1,15 +1,10 @@
 'use strict'
 
-const { remap } = require('@toa.io/generic')
 const { Component, Locator, State, entities } = require('@toa.io/core')
-const { Schema } = require('@toa.io/schema')
+const schemas = require('@toa.io/schemas')
 
 const boot = require('./index')
 
-/**
- * @param {toa.norm.Component} manifest
- * @returns {Promise<toa.core.Component>}
- */
 const component = async (manifest) => {
   boot.extensions.load(manifest)
 
@@ -21,17 +16,13 @@ const component = async (manifest) => {
   let state
 
   if (manifest.entity !== undefined) {
-    const schema = new Schema(manifest.entity.schema)
+    const schema = schemas.schema(manifest.entity.schema)
     const entity = new entities.Factory(schema)
 
-    state = new State(storage, entity, emission, manifest.entity.dependent)
+    state = new State(storage, entity, emission, manifest.entity.associated)
   }
 
-  const operations = manifest.operations === undefined
-    ? {}
-    : remap(manifest.operations, (definition, endpoint) =>
-      boot.operation(manifest, endpoint, definition, context, state))
-
+  const operations = await bootOperations(manifest, context, state)
   const component = new Component(locator, operations)
 
   if (storage) component.depends(storage)
@@ -40,4 +31,16 @@ const component = async (manifest) => {
   return boot.extensions.component(component)
 }
 
+async function bootOperations (manifest, context, state) {
+  if (manifest.operations === undefined)
+    return {}
+
+  const operations = {}
+
+  for (const [endpoint, definition] of Object.entries(manifest.operations))
+    operations[endpoint] = await boot.operation(manifest, endpoint, definition, context, state)
+
+  return operations
+}
+
 exports.component = component

package/src/composition.js

@@ -1,6 +1,8 @@
 'use strict'
 
+const { console } = require('openspan')
 const { Composition } = require('@toa.io/core')
+const { version } = require('@toa.io/runtime/package.json')
 
 const boot = require('./index')
 
@@ -8,6 +10,12 @@ async function composition (paths, options) {
   options = Object.assign({}, options)
 
   const manifests = await Promise.all(paths.map((path) => boot.manifest(path, options)))
+
+  console.info('Starting composition', {
+    runtime: version,
+    components: manifests.map((manifest) => manifest.locator.id)
+  })
+
   const tenants = await Promise.all(manifests.map(boot.extensions.tenants))
   const expositions = await Promise.all(manifests.map(boot.discovery.expose))
   const components = await Promise.all(manifests.map(boot.component))

package/src/contract.js

@@ -1,18 +1,18 @@
 'use strict'
 
 const { contract: { Request, Reply } } = require('@toa.io/core')
-const { Schema } = require('@toa.io/schema')
+const schemas = require('@toa.io/schemas')
 
 const request = (definition, entity) => {
   const request = Request.schema(definition, entity)
-  const schema = new Schema(request, { removeAdditional: true }) // soft inputs
+  const schema = schemas.schema(request, { removeAdditional: true })
 
-  return new Request(schema)
+  return new Request(schema, definition)
 }
 
-const reply = (output, error) => {
-  const reply = Reply.schema(output, error)
-  const schema = new Schema(reply) // outputs strict
+const reply = (output, errors) => {
+  const reply = Reply.schema(output, errors)
+  const schema = schemas.schema(reply)
 
   return new Reply(schema)
 }

package/src/extensions/load.js

@@ -6,9 +6,11 @@ const { resolve } = require('./resolve')
  * @param {toa.norm.Component} manifest
  */
 const load = (manifest) => {
-  if (manifest.extensions === undefined) return
+  if (manifest.extensions === undefined)
+    return
 
-  for (const name of Object.keys(manifest.extensions)) resolve(name, manifest.path)
+  for (const name of Object.keys(manifest.extensions))
+    resolve(name, manifest.path)
 }
 
 exports.load = load

package/src/extensions/receiver.js

@@ -11,7 +11,8 @@ const receiver = (receiver, locator) => {
   let decorated = receiver
 
   for (const factory of Object.values(instances)) {
-    if (factory.receiver !== undefined) decorated = factory.receiver(decorated, locator)
+    if (factory.receiver !== undefined)
+      decorated = factory.receiver(decorated, locator)
   }
 
   return decorated

package/src/extensions/tenants.js

@@ -16,7 +16,7 @@ const tenants = (manifest) => {
 
     if (factory.tenant === undefined) continue
 
-    const tenant = factory.tenant(manifest.locator, declaration)
+    const tenant = factory.tenant(manifest.locator, declaration, manifest)
 
     tenants.push(tenant)
   }

package/src/manifest.js

@@ -5,37 +5,40 @@ const { merge } = require('@toa.io/generic')
 const { component: load } = require('@toa.io/norm')
 const { Locator } = require('@toa.io/core')
 
-/**
- * @type {toa.boot.Manifest}
- */
 const manifest = async (path, options = {}) => {
   options = merge(clone(options), DEFAULTS)
 
   const manifest = await load(path)
 
   if (options?.bindings !== undefined) {
-    if ('operations' in manifest)
-      for (const operation of Object.values(manifest.operations))
+    if ('operations' in manifest) {
+      for (const operation of Object.values(manifest.operations)) {
         operation.bindings = options.bindings
+      }
+    }
 
     const check = (binding) => require(binding).properties?.async === true
     const asyncBinding = options.bindings.find(check)
 
     if (asyncBinding === undefined) throw new Error('Bindings override must contain at least one async binding')
 
-    if ('events' in manifest)
+    if ('events' in manifest) {
       for (const event of Object.values(manifest.events)) event.binding = asyncBinding
+    }
 
-    if ('receivers' in manifest)
-      for (const receiver of Object.values(manifest.receivers))
+    if ('receivers' in manifest) {
+      for (const receiver of Object.values(manifest.receivers)) {
         if (receiver.source === undefined) receiver.binding = asyncBinding
+      }
+    }
   }
 
   if (manifest.extensions === undefined) manifest.extensions = {}
 
-  // add `null` manifests
-  for (const extension of options.extensions) {
-    if (!(extension in manifest.extensions)) manifest.extensions[extension] = null
+  if (options.extensions !== undefined) {
+    for (const extension of options.extensions) {
+      if (!(extension in manifest.extensions)) manifest.extensions[extension] = null
+    }
   }
 
   if ('storage' in options && 'entity' in manifest) manifest.entity.storage = options.storage
@@ -45,8 +48,6 @@ const manifest = async (path, options = {}) => {
   return manifest
 }
 
-const DEFAULTS = {
-  extensions: ['@toa.io/extensions.sampling']
-}
+const DEFAULTS = {}
 
 exports.manifest = manifest

package/src/operation.js

@@ -1,15 +1,16 @@
 'use strict'
 
-const { Transition, Observation, Assignment, Operation, Query } = require('@toa.io/core')
+const { Transition, Observation, Assignment, Operation, Query, Effect } = require('@toa.io/core')
 
 const boot = require('./index')
 
-const operation = (manifest, endpoint, definition, context, scope) => {
-  const cascade = boot.cascade(manifest, endpoint, definition, context)
+async function operation (manifest, endpoint, definition, context, scope) {
+  const cascade = await boot.cascade(manifest, endpoint, definition, context)
   const reply = boot.contract.reply(definition.output, definition.error)
   const input = definition.input
   const request = boot.contract.request({ input }, manifest.entity)
   const contracts = { reply, request }
+
   const query = manifest.entity === undefined
     ? undefined
     : new Query(manifest.entity.schema.properties)
@@ -24,7 +25,7 @@ const TYPES = {
   observation: Observation,
   assignment: Assignment,
   computation: Operation,
-  effect: Operation
+  effect: Effect
 }
 
 exports.operation = operation

package/src/receivers.js

@@ -5,7 +5,7 @@ const { Receiver, Locator } = require('@toa.io/core')
 const boot = require('./index')
 const extensions = require('./extensions')
 
-const receivers = async (manifest, runtime) => {
+const receivers = async (manifest, component) => {
   if (manifest.receivers === undefined) return []
 
   const receivers = []
@@ -21,7 +21,7 @@ const receivers = async (manifest, runtime) => {
     const source = definition.source ? Locator.parse(definition.source) : locator
     const binding = boot.bindings.receive(transport, source, label, manifest.locator.id, decorator)
 
-    binding.depends(runtime)
+    binding.depends(component)
     receivers.push(binding)
   }
 

package/src/remote.js

@@ -5,10 +5,13 @@ const { remap } = require('@toa.io/generic')
 
 const boot = require('./index')
 
-const remote = async (locator, manifest = undefined) => {
-  const discovery = await boot.discovery.discovery()
+const remote = async (locator, manifest) => {
+  let discovery
 
-  if (manifest === undefined) manifest = await discovery.lookup(locator)
+  if (manifest === undefined) {
+    discovery = await boot.discovery.discovery(locator)
+    manifest = await discovery.lookup(locator)
+  }
 
   const calls = manifest.operations === undefined
     ? {}
@@ -17,7 +20,8 @@ const remote = async (locator, manifest = undefined) => {
   const remote = new Remote(locator, calls)
 
   // ensure discovery shutdown
-  remote.depends(discovery)
+  if (discovery !== undefined)
+    remote.depends(discovery)
 
   return remote
 }

package/src/storage.js

@@ -6,11 +6,11 @@ const extensions = require('./extensions')
 const storage = (manifest) => {
   if (manifest.entity === undefined) return
 
-  const [Factory, properties] = load(manifest)
+  const Factory = load(manifest)
 
   /** @type {toa.core.storages.Factory} */
   const factory = new Factory()
-  const storage = factory.storage(manifest.locator, properties)
+  const storage = factory.storage(manifest.locator, manifest.entity)
 
   return extensions.storage(storage)
 }
@@ -20,22 +20,7 @@ function load (component) {
   const path = require.resolve(reference, { paths: [component.path, __dirname] })
   const { Factory } = require(path)
 
-  const pkg = loadPackageJson(component.path, reference)
-  const properties = pkg === null ? null : component.properties?.[pkg.name]
-
-  return [Factory, properties]
-}
-
-function loadPackageJson (root, reference) {
-  const packageJson = join(reference, 'package.json')
-
-  try {
-    const path = require.resolve(packageJson, { paths: [root, __dirname] })
-
-    return require(path)
-  } catch (e) {
-    return null
-  }
+  return Factory
 }
 
 exports.storage = storage

package/types/index.d.ts

@@ -5,17 +5,17 @@ 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 remote (locator: core.Locator): Promise<core.Remote>
 
 export async function receive<T = any> (
   label: string,
-  receiver: Receiver,
+  receiver: Receiver
 ): Promise<core.Connector>
 
 export async function receive<T = any> (
   label: string,
   group: string | undefined,
-  receiver: Receiver,
+  receiver: Receiver
 ): Promise<core.Connector>
 
 type Receiver = { receive: (message: core.Message<T>) => void | Promise<void> }