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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/core",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.0-alpha.92",
   "description": "Toa Core",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -21,13 +21,10 @@
   },
   "dependencies": {
     "@rsql/parser": "1.2.4",
-    "@toa.io/console": "1.0.0-alpha.9",
-    "@toa.io/generic": "1.0.0-alpha.9",
-    "@toa.io/yaml": "1.0.0-alpha.9",
-    "error-value": "0.3.0"
+    "@toa.io/generic": "1.0.0-alpha.63",
+    "@toa.io/yaml": "1.0.0-alpha.63",
+    "error-value": "0.3.0",
+    "openspan": "1.0.0-alpha.92"
   },
-  "devDependencies": {
-    "clone-deep": "4.0.1"
-  },
-  "gitHead": "017a3fa22e8c60654c240f8e55908773d44d4ed1"
+  "gitHead": "975ee5af6194354efb6dd8c646b22a89c4d96f7a"
 }

package/src/call.js

@@ -37,6 +37,10 @@ class Call extends Connector {
         return reply.output
     }
   }
+
+  explain () {
+    return this.#contract.discovery
+  }
 }
 
 exports.Call = Call

package/src/cascade.js

@@ -1,16 +1,15 @@
 'use strict'
 
-const { merge } = require('@toa.io/generic')
 const { Connector } = require('./connector')
 
 class Cascade extends Connector {
-  #bridges
+  // #bridges
   #last
 
   constructor (bridges) {
     super()
 
-    this.#bridges = bridges
+    // this.#bridges = bridges
     this.#last = bridges[bridges.length - 1]
 
     this.depends(bridges)

package/src/component.js

@@ -1,40 +1,37 @@
 'use strict'
 
-const { console } = require('@toa.io/console')
+const assert = require('node:assert')
+const { console } = require('openspan')
 const { Connector } = require('./connector')
-const { NotImplementedException } = require('./exceptions')
 
-/**
- * @implements {toa.core.Component}
- */
 class Component extends Connector {
   locator
 
-  #operations
+  /** @protected */
+  operations
 
   constructor (locator, operations) {
     super()
 
     this.locator = locator
-    this.#operations = operations
+    this.operations = operations
 
     Object.values(operations).forEach((operation) => this.depends(operation))
   }
 
-  async open () {
-    console.info(`Runtime '${this.locator.id}' connected`)
-  }
+  async invoke (endpoint, request) {
+    assert.ok(endpoint in this.operations,
+      `Endpoint '${endpoint}' is not provided by '${this.locator.id}'`)
 
-  async dispose () {
-    console.info(`Runtime '${this.locator.id}' disconnected`)
-  }
+    const reply = await this.operations[endpoint].invoke(request)
 
-  async invoke (endpoint, request) {
-    if (!(endpoint in this.#operations)) {
-      throw new NotImplementedException(`Endpoint '${endpoint}' not found in '${this.locator.id}'`)
-    }
+    if (reply?.exception !== undefined)
+      console.error('Failed to execute operation', {
+        endpoint: `${this.locator.id}.${endpoint}`,
+        exception: reply.exception
+      })
 
-    return this.#operations[endpoint].invoke(request)
+    return reply
   }
 }
 

package/src/composition.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { console } = require('@toa.io/console')
+const { console } = require('openspan')
 const { Connector } = require('./connector')
 
 class Composition extends Connector {

package/src/connector.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { console } = require('@toa.io/console')
+const { console } = require('openspan')
 const { newid } = require('@toa.io/generic')
 
 /**
@@ -86,8 +86,6 @@ class Connector {
 
     this.#disconnecting = undefined
 
-    console.debug(`Connecting '${this.id}' with ${this.#dependencies.length} dependencies...`)
-
     this.#connecting = (async () => {
       await Promise.all(this.#dependencies.map((connector) => connector.connect()))
       await this.open()
@@ -100,8 +98,6 @@ class Connector {
       await this.disconnect(true)
       throw e
     }
-
-    console.debug(`Connector '${this.id}' connected`)
   }
 
   /**
@@ -132,7 +128,8 @@ class Connector {
       const interval = setInterval(() => {
         const delay = +new Date() - start
 
-        if (delay > DELAY) console.warn(`Connector ${this.id} still disconnecting (${delay})`)
+        if (delay > DELAY)
+          console.warn(`Connector ${this.id} still disconnecting (${delay})`)
       }, DELAY)
 
       if (interrupt !== true) await this.close()
@@ -145,8 +142,6 @@ class Connector {
     })()
 
     await this.#disconnecting
-
-    console.debug(`Connector '${this.id}' disconnected`)
   }
 
   async reconnect () {

package/src/contract/contract.js

@@ -0,0 +1,23 @@
+'use strict'
+
+const { Readable } = require('node:stream')
+const { SystemException } = require('../exceptions')
+
+class Contract {
+  schema
+
+  constructor (schema) {
+    this.schema = schema
+  }
+
+  fit (value) {
+    const error = this.schema.fit(value)
+
+    if (error !== null)
+      throw new this.constructor.Exception(error, value)
+  }
+
+  static Exception = SystemException
+}
+
+exports.Contract = Contract

package/src/contract/reply.js

@@ -1,22 +1,39 @@
 'use strict'
 
 const schemas = require('./schemas')
-const { Conditions } = require('./conditions')
+const { Contract } = require('./contract')
 const { ResponseContractException } = require('../exceptions')
 
-class Reply extends Conditions {
+class Reply extends Contract {
   static Exception = ResponseContractException
 
-  /**
-   * @returns {toa.schema.JSON}
-   */
-  static schema (output, error) {
+  static schema (output, errors) {
     const schema = { type: 'object', properties: {}, additionalProperties: false }
 
-    if (output !== undefined) schema.properties.output = output
+    if (output !== undefined) {
+      if (output.type === 'object')
+        output.additionalProperties = true
+      else if (output.type === 'array' && output.items?.type === 'object')
+        output.items.additionalProperties = true
 
-    if (error !== undefined) schema.properties.error = error
-    else schema.properties.error = schemas.error
+      schema.properties.output = output
+    }
+
+    if (errors !== undefined)
+      schema.properties.error = {
+        type: 'object',
+        properties: {
+          code: {
+            enum: errors
+          },
+          message: {
+            type: 'string'
+          }
+        },
+        required: ['code']
+      }
+    else
+      schema.properties.error = schemas.error
 
     return schema
   }

package/src/contract/request.js

@@ -2,9 +2,20 @@
 
 const schemas = require('./schemas')
 const { RequestContractException } = require('../exceptions')
-const { Conditions } = require('./conditions')
+const { Contract } = require('./contract')
+
+class Request extends Contract {
+  /** @readonly */
+  discovery = {}
+
+  constructor (schema, definition) {
+    super(schema)
+
+    for (const key of ['input', 'output', 'errors'])
+      if (definition[key] !== undefined)
+        this.discovery[key] = definition[key]
+  }
 
-class Request extends Conditions {
   static Exception = RequestContractException
 
   /**
@@ -13,7 +24,7 @@ class Request extends Conditions {
   static schema (definition, entity) {
     const schema = {
       type: 'object',
-      properties: { authentic: { type: 'boolean' } },
+      properties: { authentic: { type: 'boolean' }, task: { type: 'boolean' } },
       additionalProperties: true
     }
 
@@ -22,9 +33,8 @@ class Request extends Conditions {
     if (definition.input !== undefined) {
       schema.properties.input = definition.input
       required.push('input')
-    } else {
+    } else
       schema.properties.input = { type: 'null' }
-    }
 
     if (entity === undefined)
       definition.query = false

package/src/contract/schemas/query.yaml

@@ -18,14 +18,13 @@ properties:
     minItems: 1
     items:
       type: string
-      pattern: ^[a-zA-Z]+([-a-zA-Z0-9]*[a-zA-Z0-9]+)?(:(asc|desc))?$
+      pattern: ^\w{1,32}(?::(?:asc|desc))?$
   projection:
     type: array
     uniqueItems: true
     minItems: 1
     items:
       type: string
-      pattern: ^([a-zA-Z]+([-a-zA-Z0-9]*[a-zA-Z0-9]+)?)$
       not:
         const: id
 additionalProperties: false

package/src/discovery.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { console } = require('@toa.io/console')
+const { console } = require('openspan')
 const { Connector } = require('./connector')
 
 class Discovery extends Connector {
@@ -25,14 +25,11 @@ class Discovery extends Connector {
       this.depends(this.#lookups[id])
     }
 
-    console.debug(`Sending lookup request to '${id}'`)
-
-    const warning = () => console.warn(`Waiting for lookup response from '${id}'...`)
+    const warning = () => console.warn(`Waiting for lookup response`, { component: id })
     const timeout = setTimeout(warning, TIMEOUT)
 
     const output = await this.#lookups[id].invoke()
 
-    console.debug(`Lookup response from '${id}' received`)
     clearTimeout(timeout)
 
     return output

package/src/effect.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const { Observation } = require('./observation')
+
+class Effect extends Observation {
+
+  async acquire (store) {
+    const { query, entity, input } = store.request
+
+    if (entity === undefined)
+      return super.acquire(store)
+
+    store.scope = await this.scope.ensure(query, entity, input)
+    store.state = store.scope.get()
+  }
+
+}
+
+exports.Effect = Effect

package/src/entities/changeset.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { merge, overwrite, newid } = require('@toa.io/generic')
 const { EntityContractException } = require('../exceptions')
 
 class Changeset {
@@ -14,7 +13,7 @@ class Changeset {
     this.query = query
 
     this.#schema = schema
-    this.#state = schema.system()
+    this.#state = {}
   }
 
   get () {
@@ -22,25 +21,19 @@ class Changeset {
   }
 
   set (value) {
-    const error = this.#schema.adapt(value)
+    const error = this.#schema.match(value)
 
-    if (error !== null) throw new EntityContractException(error)
+    if (error !== null)
+      throw new EntityContractException(error, value)
+
+    delete value._version
+    value._updated = Date.now()
 
     this.#state = value
   }
 
   export () {
-    const changeset = this.#state
-    const result = { changeset }
-    const insert = merge({ id: newid() }, changeset)
-    const error = this.#schema.fit(insert)
-
-    if (error === null) {
-      delete insert.id
-      result.insert = overwrite(insert, changeset)
-    }
-
-    return result
+    return this.#state
   }
 }
 

package/src/entities/entity.js

@@ -1,13 +1,10 @@
 'use strict'
 
-const {
-  difference,
-  newid
-} = require('@toa.io/generic')
-
+const { difference, newid } = require('@toa.io/generic')
 const { EntityContractException } = require('../exceptions')
 
 class Entity {
+  deleted = false
   #schema
   #origin = null
   #state
@@ -29,38 +26,48 @@ class Entity {
     return this.#state
   }
 
-  set (value) {
-    const error = this.#schema.fit(value)
+  set (value, optional = false) {
+    const error = optional ? this.#schema.fitOptional(value) : this.#schema.fit(value)
 
-    if (error !== null) throw new EntityContractException(error)
+    if (error !== null)
+      throw new EntityContractException(error, value)
 
     this.#set(value)
   }
 
-  event () {
+  event (input = undefined) {
     return {
       origin: this.#origin,
       state: this.#state,
-      changeset: this.#origin === null ? this.#state : difference(this.#origin, this.#state)
+      changeset: this.#origin === null ? this.#state : difference(this.#origin, this.#state),
+      trailers: this.#state._trailers,
+      input
     }
   }
 
   #init (id) {
-    const value = {
-      ...this.#schema.defaults({ id }),
-      _version: 0
-    }
+    const value = { id, _version: 0 }
 
-    this.#set(value)
+    this.set(value, true)
   }
 
   #set (value) {
-    Object.defineProperty(value, 'id', {
-      writable: false,
-      configurable: false
-    })
+    if (!('_trailers' in value))
+      Object.defineProperty(value, '_trailers', {
+        writable: false,
+        configurable: false,
+        enumerable: false,
+        value: {}
+      })
+
+    if (!('_created' in value))
+      value._created = Date.now()
+
+    if (value._deleted !== null)
+      this.deleted = true
 
     if (this.#state !== undefined) {
+      value._updated = Date.now()
       value._version++
     }
 

package/src/entities/factory.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { newid } = require('@toa.io/generic')
+
 const { Entity } = require('./entity')
 const { EntitySet } = require('./set')
 const { Changeset } = require('./changeset')
@@ -11,6 +13,10 @@ class Factory {
     this.#schema = schema
   }
 
+  fit (values) {
+    this.#schema.validate({ id: newid(), ...values }, 'Entity')
+  }
+
   init (id) {
     return new Entity(this.#schema, id)
   }

package/src/exceptions.js

@@ -4,7 +4,6 @@ const { swap } = require('@toa.io/generic')
 
 const codes = {
   System: 0,
-  NotImplemented: 10,
 
   Contract: 200,
   RequestSyntax: 201,
@@ -32,9 +31,12 @@ class Exception {
   code
   message
 
-  constructor (code, message) {
+  constructor (code, message, cause) {
     this.code = code
     this.message = message
+
+    if (cause !== undefined)
+      this.cause = cause
   }
 }
 
@@ -49,31 +51,26 @@ class SystemException extends Exception {
 }
 
 class ContractException extends Exception {
-  keyword
-  property
-  schema
-  path
-
-  constructor (code, error) {
-    super(code || codes.Contract, error.message)
-
-    this.keyword = error.keyword
-    this.property = error.property
-    this.schema = error.schema
-    this.path = error.path
+  constructor (code, error, cause) {
+    super(code || codes.Contract, typeof error === 'string' ? error : error?.message, cause)
+
+    if (typeof error === 'object' && error !== null)
+      for (const k of ['keyword', 'property', 'schema', 'path', 'params'])
+        if (k in error)
+          this[k] = error[k]
   }
 }
 
 class RequestContractException extends ContractException {
-  constructor (error) { super(codes.RequestContract, error) }
+  constructor (error, cause) { super(codes.RequestContract, error, cause) }
 }
 
 class ResponseContractException extends ContractException {
-  constructor (error) { super(codes.ResponseContract, error) }
+  constructor (error, cause) { super(codes.ResponseContract, error, cause) }
 }
 
 class EntityContractException extends ContractException {
-  constructor (error) { super(codes.EntityContract, error) }
+  constructor (error, cause) { super(codes.EntityContract, error, cause) }
 }
 
 // #region exports
@@ -88,8 +85,12 @@ for (const [name, code] of Object.entries(codes)) {
 
   if (exports[classname] === undefined) {
     exports[classname] = class extends Exception {
-      constructor (message) {
-        super(code, message || classname)
+      constructor (message, cause) {
+        message = message
+          ? `${classname}: ${message}`
+          : classname
+
+        super(code, message ?? classname, cause)
       }
     }
   }

package/src/exposition.js

@@ -20,8 +20,9 @@ class Exposition extends Connector {
 }
 
 const expose = (manifest) => {
-  const { namespace, name, operations, events, entity } = manifest
-  return { namespace, name, operations, events, entity }
+  const { namespace, name, entity, operations, events } = manifest
+
+  return { namespace, name, entity, operations, events }
 }
 
 exports.Exposition = Exposition

package/src/index.js

@@ -5,6 +5,7 @@ const { Composition } = require('./composition')
 const { Connector } = require('./connector')
 const { Context } = require('./context')
 const { Discovery } = require('./discovery')
+const { Effect } = require('./effect')
 const { Emission } = require('./emission')
 const { Event } = require('./event')
 const { Exposition } = require('./exposition')
@@ -32,6 +33,7 @@ exports.Composition = Composition
 exports.Connector = Connector
 exports.Context = Context
 exports.Discovery = Discovery
+exports.Effect = Effect
 exports.Emission = Emission
 exports.Event = Event
 exports.Exposition = Exposition

package/src/locator.js

@@ -12,6 +12,7 @@ class Locator {
   id
   label
   uppercase
+  lowercase
 
   /**
    * @param {string} name
@@ -26,6 +27,7 @@ class Locator {
     this.id = concat(namespace, '.') + name
     this.label = (concat(namespace, '-') + name).toLowerCase()
     this.uppercase = (concat(namespace, '_') + name).toUpperCase()
+    this.lowercase = (concat(namespace, '_') + name).toLowerCase()
   }
 
   hostname (prefix) {
@@ -39,8 +41,11 @@ class Locator {
   static parse (string) {
     const [namespace, name] = string.split(DOT)
 
-    if (name === undefined) return new Locator(namespace)
-    else return new Locator(name, namespace)
+    if (name === undefined) {
+      return new Locator(namespace)
+    } else {
+      return new Locator(name, namespace)
+    }
   }
 }
 

package/src/observation.js

@@ -3,16 +3,8 @@
 const { Operation } = require('./operation')
 
 class Observation extends Operation {
-  async acquire (store) {
-    const scope = await this.query(store.request.query)
-    const state = scope === null ? null : scope.get()
-
-    store.scope = scope
-    store.state = state
-  }
-
   async run (store) {
-    if (store.scope === null) store.reply = null
+    if (store.scope === null || store.scope?.deleted === true) store.reply = null
     else await super.run(store)
   }
 }