@toa.io/userland 1.0.0-alpha.9 → 1.0.0-alpha.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/userland",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.0-alpha.92",
   "description": "Toa development kit",
   "homepage": "https://toa.io",
   "author": {
@@ -16,7 +16,7 @@
     "url": "https://github.com/toa-io/toa/issues"
   },
   "engines": {
-    "node": ">= 18.0.0"
+    "node": ">= 20.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -24,15 +24,14 @@
   "main": "src/index.js",
   "types": "types/index.d.ts",
   "dependencies": {
-    "@toa.io/boot": "1.0.0-alpha.9",
-    "@toa.io/core": "1.0.0-alpha.9",
-    "@toa.io/filesystem": "1.0.0-alpha.9",
-    "@toa.io/generic": "1.0.0-alpha.9",
-    "@toa.io/norm": "1.0.0-alpha.9",
-    "@toa.io/schemas": "1.0.0-alpha.9",
+    "@toa.io/boot": "1.0.0-alpha.92",
+    "@toa.io/core": "1.0.0-alpha.92",
+    "@toa.io/filesystem": "1.0.0-alpha.63",
+    "@toa.io/generic": "1.0.0-alpha.63",
+    "@toa.io/norm": "1.0.0-alpha.92",
+    "@toa.io/schemas": "1.0.0-alpha.63",
     "@toa.io/storages.null": "0.22.0",
-    "@toa.io/yaml": "1.0.0-alpha.9",
-    "tap": "16.3.4"
+    "@toa.io/yaml": "1.0.0-alpha.63"
   },
-  "gitHead": "017a3fa22e8c60654c240f8e55908773d44d4ed1"
+  "gitHead": "975ee5af6194354efb6dd8c646b22a89c4d96f7a"
 }

package/stage/src/component.js

@@ -5,8 +5,6 @@ const { state } = require('./state')
 
 /** @type {toa.stage.Component} */
 const component = async (path, options) => {
-  options = Object.assign({}, DEFAULTS, options)
-
   const manifest = await boot.manifest(path, options)
   const component = await boot.component(manifest)
 
@@ -17,7 +15,4 @@ const component = async (path, options) => {
   return component
 }
 
-const binding = require.resolve('./binding')
-const DEFAULTS = { bindings: [binding] }
-
 exports.component = component

package/stage/src/composition.js

@@ -3,12 +3,8 @@
 const boot = require('@toa.io/boot')
 const { state } = require('./state')
 
-const binding = require.resolve('./binding')
-
 /** @type {toa.stage.Composition} */
 const composition = async (paths, options) => {
-  options ??= { bindings: [binding] }
-
   const composition = await boot.composition(paths, options)
 
   await composition.connect()

package/stage/src/index.js

@@ -6,7 +6,6 @@ const { composition } = require('./composition')
 const { service } = require('./service')
 const { remote } = require('./remote')
 const { shutdown } = require('./shutdown')
-const binding = require('./binding')
 
 exports.manifest = manifest
 exports.component = component
@@ -15,4 +14,3 @@ exports.compose = composition
 exports.serve = service
 exports.remote = remote
 exports.shutdown = shutdown
-exports.binding = binding

package/stage/src/shutdown.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const { state } = require('./state')
-const { binding } = require('./binding')
 
 /** @type {toa.stage.Shutdown} */
 const shutdown = async () => {
@@ -14,7 +13,6 @@ const shutdown = async () => {
   await Promise.all(disconnections)
 
   state.reset()
-  binding.reset()
 }
 
 exports.shutdown = shutdown

package/stage/test/composition.test.js

@@ -25,14 +25,3 @@ it('should boot composition', async () => {
 
   expect(composition.connect).toHaveBeenCalled()
 })
-
-it('should override bindings', async () => {
-  await stage.composition(paths)
-
-  const path = require.resolve('../src/binding')
-
-  /** @type {toa.boot.composition.Options} */
-  const options = { bindings: [path] }
-
-  expect(mock.boot.composition.mock.calls[0][1]).toStrictEqual(options)
-})

package/stage/test/shutdown.test.js

@@ -4,16 +4,13 @@ const { generate } = require('randomstring')
 
 const mock = {
   boot: require('./boot.mock'),
-  state: require('./state.mock'),
-  binding: require('./binding.mock')
+  state: require('./state.mock')
 }
 
 jest.mock('@toa.io/boot', () => mock.boot)
 jest.mock('../src/state', () => mock.state)
-jest.mock('../src/binding', () => mock.binding)
 
 const { state } = require('../src/state')
-const { binding } = require('../src/binding')
 const stage = require('../')
 
 beforeEach(() => {
@@ -58,9 +55,3 @@ it('should reset state', async () => {
 
   expect(state.reset).toHaveBeenCalled()
 })
-
-it('should reset binding', async () => {
-  await stage.shutdown()
-
-  expect(binding.reset).toHaveBeenCalled()
-})

package/stage/types/index.d.ts

@@ -15,5 +15,3 @@ export function serve (ref: string): Promise<_core.Component>
 export function remote (id: string): Promise<_core.Component>
 
 export function shutdown (): Promise<void>
-
-export * as binding from './binding'

package/stage/src/binding/binding.js

@@ -1,50 +0,0 @@
-'use strict'
-
-/**
- * @implements {toa.stage.binding.Binding}
- */
-class Binding {
-  /** @type {Record<string, function[]>} */
-  #callbacks = {}
-
-  /** @type {Record<string, function>} */
-  #producers = {}
-
-  async subscribe (label, callback) {
-    if (this.#callbacks[label] === undefined) this.#callbacks[label] = []
-
-    this.#callbacks[label].push(callback)
-  }
-
-  async emit (label, message) {
-    if (!(label in this.#callbacks)) return
-
-    const callbacks = this.#callbacks[label]
-    const promises = callbacks.map((callback) => callback(message))
-
-    await Promise.all(promises)
-  }
-
-  async reply (label, produce) {
-    if (label in this.#producers) throw new Error(`Label '${label}' is already bound`)
-
-    this.#producers[label] = produce
-  }
-
-  async request (label, request) {
-    if (!(label in this.#producers)) throw new Error(`Label '${label}' is not bound`)
-
-    const produce = this.#producers[label]
-
-    return produce(request)
-  }
-
-  reset () {
-    this.#callbacks = {}
-    this.#producers = {}
-  }
-}
-
-const binding = new Binding()
-
-exports.binding = binding

package/stage/src/binding/consumer.js

@@ -1,30 +0,0 @@
-'use strict'
-
-const { Connector } = require('@toa.io/core')
-
-const { binding } = require('./binding')
-const { label } = require('./label')
-
-/**
- * @implements {toa.core.bindings.Consumer}
- */
-class Consumer extends Connector {
-  /** @type {string} */
-  #label
-
-  /**
-   * @param {toa.core.Locator} locator
-   * @param {string} endpoint
-   */
-  constructor (locator, endpoint) {
-    super()
-
-    this.#label = label(locator, endpoint)
-  }
-
-  async request (request) {
-    return binding.request(this.#label, request)
-  }
-}
-
-exports.Consumer = Consumer

package/stage/src/binding/emitter.js

@@ -1,26 +0,0 @@
-'use strict'
-
-const { Connector } = require('@toa.io/core')
-
-const { binding } = require('./binding')
-const { label } = require('./label')
-
-/**
- * @implements {toa.core.bindings.Emitter}
- */
-class Emitter extends Connector {
-  /** @type {string} */
-  #label
-
-  constructor (locator, endpoint) {
-    super()
-
-    this.#label = label(locator, endpoint)
-  }
-
-  async emit (message) {
-    await binding.emit(this.#label, message)
-  }
-}
-
-exports.Emitter = Emitter

package/stage/src/binding/factory.js

@@ -1,49 +0,0 @@
-'use strict'
-
-const { Emitter } = require('./emitter')
-const { Receiver } = require('./receiver')
-const { Consumer } = require('./consumer')
-const { Producer } = require('./producer')
-
-class Factory {
-  /**
-   * @param {toa.core.Locator} source
-   * @param {string} label
-   * @param {string} group
-   * @param {toa.core.Receiver} receiver
-   * @returns {toa.core.Connector}
-   */
-  receiver (source, label, group, receiver) {
-    return new Receiver(label, receiver)
-  }
-
-  /**
-   * @param {toa.core.Locator} locator
-   * @param {string} label
-   * @returns {toa.core.bindings.Emitter}
-   */
-  emitter (locator, label) {
-    return new Emitter(locator, label)
-  }
-
-  /**
-   * @param {toa.core.Locator} locator
-   * @param {string} endpoint
-   * @returns {toa.core.bindings.Consumer}
-   */
-  consumer (locator, endpoint) {
-    return new Consumer(locator, endpoint)
-  }
-
-  /**
-   * @param {toa.core.Locator} locator
-   * @param {string[]} endpoints
-   * @param {toa.core.Component} component
-   * @returns {toa.core.Connector}
-   */
-  producer (locator, endpoints, component) {
-    return new Producer(locator, endpoints, component)
-  }
-}
-
-exports.Factory = Factory

package/stage/src/binding/index.js

@@ -1,10 +0,0 @@
-'use strict'
-
-const { Factory } = require('./factory')
-const { binding } = require('./binding')
-
-const properties = { async: true }
-
-exports.properties = properties
-exports.Factory = Factory
-exports.binding = binding

package/stage/src/binding/label.js

@@ -1,12 +0,0 @@
-'use strict'
-
-/**
- * @param {toa.core.Locator} locator
- * @param {string} endpoint
- * @returns {string}
- */
-const label = (locator, endpoint) => {
-  return locator.id + '.' + endpoint
-}
-
-exports.label = label

package/stage/src/binding/producer.js

@@ -1,43 +0,0 @@
-'use strict'
-
-const { Connector } = require('@toa.io/core')
-
-const { binding } = require('./binding')
-const { label } = require('./label')
-
-/**
- * @implements {toa.core.Connector}
- */
-class Producer extends Connector {
-  /** @type {toa.core.Locator} */
-  #locator
-
-  /** @type {string[]} */
-  #endpoints
-
-  /** @type {toa.core.Component} */
-  #component
-
-  /**
-   * @param {toa.core.Locator} locator
-   * @param {string[]} endpoints
-   * @param {toa.core.Component} component
-   */
-  constructor (locator, endpoints, component) {
-    super()
-
-    this.#locator = locator
-    this.#endpoints = endpoints
-    this.#component = component
-  }
-
-  async open () {
-    for (const endpoint of this.#endpoints) {
-      const command = label(this.#locator, endpoint)
-
-      await binding.reply(command, (request) => this.#component.invoke(endpoint, request))
-    }
-  }
-}
-
-exports.Producer = Producer

package/stage/src/binding/receiver.js

@@ -1,34 +0,0 @@
-'use strict'
-
-const { Connector } = require('@toa.io/core')
-
-const { binding } = require('./binding')
-
-/**
- * @implements {toa.core.Connector}
- */
-class Receiver extends Connector {
-  /** @type {string} */
-  #label
-
-  /** @type {toa.core.Receiver} */
-  #receiver
-
-  /**
-   * @param {toa.core.Locator} locator
-   * @param {string} label
-   * @param {toa.core.Receiver} receiver
-   */
-  constructor (label, receiver) {
-    super()
-
-    this.#label = label
-    this.#receiver = receiver
-  }
-
-  async open () {
-    await binding.subscribe(this.#label, (message) => this.#receiver.receive(message))
-  }
-}
-
-exports.Receiver = Receiver

package/stage/test/binding/binding.test.js

@@ -1,15 +0,0 @@
-'use strict'
-
-const { properties, binding, Factory } = require('../../src').binding
-
-it('should be async', async () => {
-  expect(properties.async).toStrictEqual(true)
-})
-
-it('should export Factory', async () => {
-  expect(Factory).toBeDefined()
-})
-
-it('should export binding instance', async () => {
-  expect(binding).toBeDefined()
-})

package/stage/test/binding/consumer.test.js

@@ -1,52 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-const { Connector, Locator } = require('@toa.io/core')
-
-const { binding, Factory } = require('../../src/binding')
-
-const factory = new Factory()
-
-it('should expose consumers factory', async () => {
-  expect(factory.consumer).toBeDefined()
-})
-
-/** @type {toa.core.bindings.Consumer} */
-let consumer
-
-/** @type {toa.core.Locator} */
-let locator
-
-/** @type {string} */
-let label
-
-const endpoint = generate()
-
-beforeEach(() => {
-  jest.clearAllMocks()
-  binding.reset()
-
-  const namespace = generate()
-  const name = generate()
-
-  locator = new Locator(name, namespace)
-  label = locator.id + '.' + endpoint
-  consumer = factory.consumer(locator, endpoint)
-})
-
-it('should return Connector', async () => {
-  expect(consumer).toBeInstanceOf(Connector)
-})
-
-it('should return reply', async () => {
-  const request = generate()
-  const reply = generate()
-  const call = jest.fn(async () => reply)
-
-  await binding.reply(label, call)
-
-  const received = await consumer.request(request)
-
-  expect(call).toHaveBeenCalledWith(request)
-  expect(received).toStrictEqual(reply)
-})

package/stage/test/binding/emitter.test.js

@@ -1,54 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-const { Locator, Connector } = require('@toa.io/core')
-
-const { binding, Factory } = require('../../src/binding')
-
-const factory = new Factory()
-
-it('should expose emitters factory', async () => {
-  expect(factory.emitter).toBeDefined()
-})
-
-/** @type {toa.core.bindings.Emitter} */
-let emitter
-
-/** @type {string} */
-let label
-
-/** @type {toa.core.Locator} */
-let locator
-
-const endpoint = generate()
-
-beforeEach(() => {
-  jest.clearAllMocks()
-  binding.reset()
-
-  const namespace = generate()
-  const name = generate()
-
-  locator = new Locator(name, namespace)
-  label = locator.id + '.' + endpoint
-  emitter = factory.emitter(locator, endpoint)
-})
-
-it('should return Connector', async () => {
-  expect(emitter).toBeInstanceOf(Connector)
-})
-
-it('should call receiver', async () => {
-  const callback = jest.fn(async () => undefined)
-
-  await binding.subscribe(label, callback)
-
-  const payload = { [generate()]: generate() }
-
-  /** @type {toa.core.Message} */
-  const message = { payload }
-
-  await emitter.emit(message)
-
-  expect(callback).toHaveBeenCalledWith(message)
-})

package/stage/test/binding/producer.fixtures.js

@@ -1,10 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-
-const endpoints = [generate(), generate()]
-const invoke = jest.fn(async () => generate())
-const producer = /** @type {jest.MockedObject<toa.core.Component>} */ { invoke }
-
-exports.endpoints = endpoints
-exports.producer = producer

package/stage/test/binding/producer.test.js

@@ -1,49 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-const { Locator, Connector } = require('@toa.io/core')
-const { sample } = require('@toa.io/generic')
-
-const fixtures = require('./producer.fixtures')
-const { binding, Factory } = require('../../src/binding')
-
-const factory = new Factory()
-
-it('should expose producers factory', async () => {
-  expect(factory.producer).toBeDefined()
-})
-
-/** @type {toa.core.Connector} */
-let producer
-
-/** @type {toa.core.Locator} */
-let locator
-
-beforeEach(async () => {
-  jest.clearAllMocks()
-  binding.reset()
-
-  const namespace = generate()
-  const name = generate()
-
-  locator = new Locator(name, namespace)
-  producer = factory.producer(locator, fixtures.endpoints, fixtures.producer)
-
-  await producer.connect()
-})
-
-it('should return Connector', async () => {
-  expect(producer).toBeInstanceOf(Connector)
-})
-
-it('should return result', async () => {
-  const endpoint = sample(fixtures.endpoints)
-  const label = locator.id + '.' + endpoint
-  const request = { [generate()]: generate() }
-
-  const reply = await binding.request(label, request)
-
-  expect(fixtures.producer.invoke).toHaveBeenCalledWith(endpoint, request)
-
-  expect(reply).toStrictEqual(await fixtures.producer.invoke.mock.results[0].value)
-})

package/stage/test/binding/receiver.fixtures.js

@@ -1,7 +0,0 @@
-'use strict'
-
-const receiver = /** @type {jest.MockedObject<toa.core.Receiver>} */ {
-  receive: jest.fn(async () => undefined)
-}
-
-exports.receiver = receiver

package/stage/test/binding/receiver.test.js

@@ -1,54 +0,0 @@
-'use strict'
-
-const { generate } = require('randomstring')
-const { Locator, Connector } = require('@toa.io/core')
-
-const fixtures = require('./receiver.fixtures')
-const { binding, Factory } = require('../../src/binding')
-
-const factory = new Factory()
-
-it('should expose receivers factory', async () => {
-  expect(factory.receiver).toBeDefined()
-})
-
-/** @type {toa.core.Connector} */
-let receiver
-
-/** @type {toa.core.Locator} */
-let locator
-
-/** @type {string} */
-let label
-
-const group = generate()
-const endpoint = generate()
-
-beforeEach(async () => {
-  jest.clearAllMocks()
-  binding.reset()
-
-  const namespace = generate()
-  const name = generate()
-
-  locator = new Locator(name, namespace)
-  label = locator.id + '.' + endpoint
-  receiver = factory.receiver(locator, label, group, fixtures.receiver)
-
-  await receiver.connect()
-})
-
-it('should return connector', async () => {
-  expect(receiver).toBeInstanceOf(Connector)
-})
-
-it('should call receiver', async () => {
-  const payload = { [generate()]: generate() }
-
-  /** @type {toa.core.Message} */
-  const message = { payload }
-
-  await binding.emit(label, message)
-
-  expect(fixtures.receiver.receive).toHaveBeenCalledWith(message)
-})

package/stage/test/binding.mock.js

@@ -1,8 +0,0 @@
-'use strict'
-
-const original = jest.requireActual('../src/binding')
-
-const reset = jest.fn(() => original.binding.reset())
-const binding = { ...original.binding, reset }
-
-module.exports = { binding }

package/stage/types/binding.d.ts

@@ -1,20 +0,0 @@
-import * as _core from '@toa.io/core'
-
-declare namespace toa.stage.binding{
-
-  type Callback = (message: Object) => Promise<void>
-  type Call = (request: Object) => Promise<Object>
-
-  interface Binding{
-    subscribe (label: string, callback: Callback): Promise<void>
-
-    emit (label: string, message: Object): Promise<undefined>
-
-    reply (label, call: Call): Promise<Object>
-  }
-
-}
-
-export type Factory = _core.bindings.Factory
-export const binding: toa.stage.binding.Binding
-export const properties: _core.bindings.Properties