@toa.io/boot 1.0.0-alpha.0 → 1.0.0-alpha.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/boot",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.11",
   "description": "Toa Boot",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -20,13 +20,13 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "1.0.0-alpha.0",
-    "@toa.io/filesystem": "1.0.0-alpha.0",
-    "@toa.io/generic": "1.0.0-alpha.0",
-    "@toa.io/norm": "1.0.0-alpha.0",
-    "@toa.io/schema": "1.0.0-alpha.0",
+    "@toa.io/core": "1.0.0-alpha.11",
+    "@toa.io/filesystem": "1.0.0-alpha.11",
+    "@toa.io/generic": "1.0.0-alpha.11",
+    "@toa.io/norm": "1.0.0-alpha.11",
+    "@toa.io/schema": "1.0.0-alpha.11",
     "clone-deep": "4.0.1",
     "dotenv": "16.1.1"
   },
-  "gitHead": "06c64546f6292cc07c52f74b31415101037f7616"
+  "gitHead": "e343ac81eef12957cfa5e520119b1276b8ec0ad2"
 }

package/src/call.js

@@ -4,10 +4,10 @@ const { Call, Transmission } = require('@toa.io/core')
 
 const boot = require('./index')
 
-const call = (locator, endpoint, definition) => {
+const call = (locator, endpoint, definition, entity) => {
   const consumers = boot.bindings.consume(locator, endpoint, definition.bindings)
   const transmission = new Transmission(consumers)
-  const contract = boot.contract.request(definition)
+  const contract = boot.contract.request(definition, entity)
 
   return new Call(transmission, contract)
 }

package/src/component.js

@@ -17,12 +17,20 @@ const component = async (manifest) => {
   const storage = boot.storage(manifest)
   const context = await boot.context(manifest)
   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)
 
-  const operations = remap(manifest.operations, (definition, endpoint) =>
-    boot.operation(manifest, endpoint, definition, context, state))
+  let state
+
+  if (manifest.entity !== undefined) {
+    const schema = new Schema(manifest.entity.schema)
+    const entity = new entities.Factory(schema)
+
+    state = new State(storage, entity, emission, manifest.entity.dependent)
+  }
+
+  const operations = manifest.operations === undefined
+    ? {}
+    : remap(manifest.operations, (definition, endpoint) =>
+      boot.operation(manifest, endpoint, definition, context, state))
 
   const component = new Component(locator, operations)
 

package/src/contract.js

@@ -3,9 +3,9 @@
 const { contract: { Request, Reply } } = require('@toa.io/core')
 const { Schema } = require('@toa.io/schema')
 
-const request = (definition) => {
-  const request = Request.schema(definition)
-  const schema = new Schema(request, { removeAdditional: true }) // inputs soft
+const request = (definition, entity) => {
+  const request = Request.schema(definition, entity)
+  const schema = new Schema(request, { removeAdditional: true }) // soft inputs
 
   return new Request(schema)
 }

package/src/discovery.js

@@ -4,14 +4,18 @@ const { Discovery, Exposition } = require('@toa.io/core')
 
 const boot = require('./index')
 
-const discovery = async () => {
-  if (discovery.instance === undefined) {
-    discovery.instance = new Discovery(lookup)
+let promise
+let instance = null
 
-    await discovery.instance.connect()
+const discovery = async () => {
+  if (instance === null) {
+    instance = new Discovery(lookup)
+    promise = instance.connect()
   }
 
-  return discovery.instance
+  await promise
+
+  return instance
 }
 
 const lookup = async (locator) => {

package/src/index.js

@@ -7,10 +7,8 @@ const { cascade } = require('./cascade')
 const { component } = require('./component')
 const { composition } = require('./composition')
 const { context } = require('./context')
-const { deployment, registry } = require('./deployment')
 const { emission } = require('./emission')
 const { exposition } = require('./exposition')
-const { images } = require('./images')
 const { manifest } = require('./manifest')
 const { operation } = require('./operation')
 const { receivers, receive } = require('./receivers')
@@ -28,14 +26,11 @@ exports.cascade = cascade
 exports.component = component
 exports.composition = composition
 exports.context = context
-exports.deployment = deployment
 exports.emission = emission
 exports.exposition = exposition
-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

@@ -14,8 +14,10 @@ const manifest = async (path, options = {}) => {
   const manifest = await load(path)
 
   if (options?.bindings !== undefined) {
-    for (const operation of Object.values(manifest.operations)) {
-      operation.bindings = options.bindings
+    if ('operations' in manifest) {
+      for (const operation of Object.values(manifest.operations)) {
+        operation.bindings = options.bindings
+      }
     }
 
     const check = (binding) => require(binding).properties?.async === true
@@ -23,9 +25,11 @@ const manifest = async (path, options = {}) => {
 
     if (asyncBinding === undefined) throw new Error('Bindings override must contain at least one async binding')
 
-    for (const event of Object.values(manifest.events)) event.binding = asyncBinding
+    if ('events' in manifest) {
+      for (const event of Object.values(manifest.events)) event.binding = asyncBinding
+    }
 
-    if (manifest.receivers) {
+    if ('receivers' in manifest) {
       for (const receiver of Object.values(manifest.receivers)) {
         if (receiver.source === undefined) receiver.binding = asyncBinding
       }
@@ -34,9 +38,10 @@ const manifest = async (path, options = {}) => {
 
   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
@@ -46,8 +51,6 @@ const manifest = async (path, options = {}) => {
   return manifest
 }
 
-const DEFAULTS = {
-  extensions: ['@toa.io/extensions.sampling']
-}
+const DEFAULTS = {}
 
 exports.manifest = manifest

package/src/operation.js

@@ -8,9 +8,12 @@ const operation = (manifest, endpoint, definition, context, scope) => {
   const cascade = 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 })
+  const request = boot.contract.request({ input }, manifest.entity)
   const contracts = { reply, request }
-  const query = new Query(manifest.entity.schema.properties)
+  const query = manifest.entity === undefined
+    ? undefined
+    : new Query(manifest.entity.schema.properties)
+
   const Type = TYPES[definition.type]
 
   return new Type(cascade, scope, contracts, query, definition)

package/src/remote.js

@@ -5,18 +5,14 @@ const { remap } = require('@toa.io/generic')
 
 const boot = require('./index')
 
-/**
- * @param {toa.core.Locator} locator
- * @param {toa.norm.Component} manifest
- * @returns {Promise<Remote>}
- */
 const remote = async (locator, manifest = undefined) => {
   const discovery = await boot.discovery.discovery()
 
   if (manifest === undefined) manifest = await discovery.lookup(locator)
 
-  const calls = remap(manifest.operations,
-    (definition, endpoint) => boot.call(locator, endpoint, definition))
+  const calls = manifest.operations === undefined
+    ? {}
+    : remap(manifest.operations, (definition, endpoint) => boot.call(locator, endpoint, definition, manifest.entity))
 
   const remote = new Remote(locator, calls)
 

package/src/storage.js

@@ -3,16 +3,14 @@
 const { join } = require('node:path')
 const extensions = require('./extensions')
 
-/**
- * @param {toa.norm.Component} component
- * @returns {toa.core.Storage}
- */
-const storage = (component) => {
-  const [Factory, properties] = load(component)
+const storage = (manifest) => {
+  if (manifest.entity === undefined) return
+
+  const Factory = load(manifest)
 
   /** @type {toa.core.storages.Factory} */
   const factory = new Factory()
-  const storage = factory.storage(component.locator, properties)
+  const storage = factory.storage(manifest.locator, manifest.entity)
 
   return extensions.storage(storage)
 }
@@ -22,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/bindings.d.ts

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

package/src/deployment.js

@@ -1,34 +0,0 @@
-'use strict'
-
-const { deployment: { Factory } } = require('@toa.io/operations')
-const { context: load } = require('@toa.io/norm')
-
-/**
- * @param {string} path
- * @param {string} [environment]
- * @returns {Promise<toa.deployment.Operator>}
- */
-const deployment = async (path, environment) => {
-  const factory = await getFactory(path, environment)
-
-  return factory.operator()
-}
-
-/**
- * @param {string} path
- * @returns {Promise<toa.deployment.Registry>}
- */
-const registry = async (path) => {
-  const factory = await getFactory(path)
-
-  return factory.registry()
-}
-
-async function getFactory (path, environment) {
-  const context = await load(path, environment)
-
-  return new Factory(context)
-}
-
-exports.deployment = deployment
-exports.registry = registry

package/src/images.js

@@ -1,12 +0,0 @@
-'use strict'
-
-const { Images } = require('@toa.io/operations')
-const { context: load } = require('@toa.io/norm')
-
-const images = async (path) => {
-  const context = await load(path)
-
-  return new Images(context)
-}
-
-exports.images = images