@toa.io/core 0.8.1 → 0.20.0-dev.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/core",
-  "version": "0.8.1",
+  "version": "0.20.0-dev.10",
   "description": "Toa Core",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -20,10 +20,10 @@
   },
   "dependencies": {
     "@rsql/parser": "1.2.4",
-    "@toa.io/console": "0.6.0",
-    "@toa.io/generic": "0.9.0",
-    "@toa.io/yaml": "0.7.3",
+    "@toa.io/console": "0.20.0-dev.10",
+    "@toa.io/generic": "0.20.0-dev.10",
+    "@toa.io/yaml": "0.20.0-dev.10",
     "clone-deep": "4.0.1"
   },
-  "gitHead": "a5019af0ad7b08182d0f245af3382f96a7e22d71"
+  "gitHead": "cd3ffb1ae1af014f13a62ef9fc8ada58d8688e4a"
 }

package/src/call.js

@@ -15,9 +15,14 @@ class Call extends Connector {
     this.depends(transmitter)
   }
 
+  /**
+   * @param {toa.core.Request} request
+   */
   async invoke (request = {}) {
     this.#contract.fit(request)
 
+    request.authentic = true
+
     const { exception, ...reply } = await this.#transmitter.request(request)
 
     if (exception) throw exception

package/src/contract/request.js

@@ -13,11 +13,10 @@ class Request extends Conditions {
    * @returns {toa.schema.JSON}
    */
   static schema (definition) {
-    const schema = { type: 'object', properties: {}, additionalProperties: true }
+    const schema = { type: 'object', properties: { authentic: { type: 'boolean' } }, additionalProperties: true }
     const required = []
 
     if (definition.input !== undefined) {
-      definition.input.additionalProperties = false
       schema.properties.input = definition.input
       required.push('input')
     } else {

package/src/contract/schemas/error.yaml

@@ -1,7 +1,8 @@
+type: object
 properties:
   code:
     type: integer
     minimum: 0
   message:
     type: string
-required: [code, message]
+required: [ code, message ]

package/src/contract/schemas/query.yaml

@@ -1,3 +1,4 @@
+type: object
 properties:
   id:
     $ref: https://schemas.toa.io/0.0.0/definitions#/definitions/id

package/src/exceptions.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { swap } = require('@toa.io/generic')
+
 const codes = {
   System: 0,
   NotImplemented: 10,
@@ -93,4 +95,5 @@ for (const [name, code] of Object.entries(codes)) {
 }
 
 exports.codes = codes
+exports.names = swap(codes)
 // #endregion

package/src/operation.js

@@ -7,26 +7,31 @@ class Operation extends Connector {
   scope
 
   #cascade
-  #contract
+  #contracts
   #query
   #scope
 
-  constructor (cascade, scope, contract, query, definition) {
+  constructor (cascade, scope, contracts, query, definition) {
     super()
 
     this.scope = scope
 
     this.#cascade = cascade
-    this.#contract = contract
+    this.#contracts = contracts
     this.#query = query
     this.#scope = definition.scope
 
     this.depends(cascade)
   }
 
+  /**
+   * @param {toa.core.Request} request
+   * @return {Promise<toa.core.Reply>}
+   */
   async invoke (request) {
     try {
-      if (request.query) request.query = this.#query.parse(request.query)
+      if (request.authentic !== true) this.#contracts.request.fit(request)
+      if ('query' in request) request.query = this.#query.parse(request.query)
 
       const store = { request }
 
@@ -52,7 +57,7 @@ class Operation extends Connector {
     const { request, state } = store
     const reply = await this.#cascade.run(request.input, state) || {}
 
-    this.#contract.fit(reply)
+    this.#contracts.reply.fit(reply)
 
     store.reply = reply
   }

package/src/receiver.js

@@ -19,29 +19,29 @@ class Receiver extends Connector {
   /** @type {toa.core.Component} */
   #local
 
-  /** @type {toa.core.bridges.Event} */
+  /** @type {toa.core.bridges.Receiver} */
   #bridge
 
   /**
    *
    * @param {toa.norm.component.Receiver} definition
    * @param {toa.core.Component} local
-   * @param {toa.core.bridges.Event} bridge
+   * @param {toa.core.bridges.Receiver} bridge
    */
   constructor (definition, local, bridge) {
     super()
 
-    const { conditioned, adaptive, transition } = definition
+    const { conditioned, adaptive, operation } = definition
 
     this.#conditioned = conditioned
     this.#adaptive = adaptive
-    this.#endpoint = transition
+    this.#endpoint = operation
 
     this.#local = local
     this.#bridge = bridge
 
     this.depends(local)
-    this.depends(bridge)
+    if (bridge !== undefined) this.depends(bridge)
   }
 
   /** @hot */
@@ -52,13 +52,13 @@ class Receiver extends Connector {
 
     const request = await this.#request(payload)
 
-    if (extensions) add(request, extensions)
+    add(request, extensions)
 
     await this.#local.invoke(this.#endpoint, request)
   }
 
   async #request (payload) {
-    return this.#adaptive ? await this.#bridge.request(payload) : payload
+    return this.#adaptive ? await this.#bridge.request(payload) : { input: payload }
   }
 }
 

package/test/contract/contract.fixtures.js

@@ -20,7 +20,8 @@ const schemas = {
     type: 'object',
     properties: {
       input: { type: 'null' },
-      query: load.sync(resolve(__dirname, '../../src/contract/schemas/query.yaml'))
+      query: load.sync(resolve(__dirname, '../../src/contract/schemas/query.yaml')),
+      authentic: { type: 'boolean' }
     },
     additionalProperties: true
   }

package/test/receiver.fixtures.js

@@ -3,7 +3,7 @@
 const { generate } = require('randomstring')
 
 const definition = /** @type {toa.norm.component.Receiver} */ {
-  transition: generate(),
+  operation: generate(),
   conditioned: false,
   adaptive: false
 }

package/test/receiver.test.js

@@ -34,7 +34,7 @@ it('should apply', async () => {
 
   await receiver.receive({ payload })
 
-  expect(fixtures.local.invoke).toHaveBeenCalledWith(definition.transition, payload)
+  expect(fixtures.local.invoke).toHaveBeenCalledWith(definition.operation, { input: payload })
 })
 
 it.each([[false], [true]])('should pass UI extensions (adaptive: %s)', async (adaptive) => {
@@ -49,7 +49,7 @@ it.each([[false], [true]])('should pass UI extensions (adaptive: %s)', async (ad
 
   await receiver.receive(message)
 
-  const request = adaptive ? await fixtures.bridge.request.mock.results[0].value : payload
+  const request = adaptive ? await fixtures.bridge.request.mock.results[0].value : { input: payload }
   const expected = merge(clone(request), extension)
 
   const argument = fixtures.local.invoke.mock.calls[0][1]
@@ -68,7 +68,7 @@ describe('conditioned', () => {
     await receiver.receive({ payload })
 
     expect(fixtures.bridge.condition).toHaveBeenCalledWith(payload)
-    expect(fixtures.local.invoke).toHaveBeenCalledWith(definition.transition, payload)
+    expect(fixtures.local.invoke).toHaveBeenCalledWith(definition.operation, { input: payload })
   })
 
   it('should not apply if condition is false', async () => {
@@ -90,6 +90,6 @@ describe('adaptive', () => {
     await receiver.receive({ payload })
 
     expect(fixtures.local.invoke)
-      .toHaveBeenCalledWith(definition.transition, await fixtures.bridge.request.mock.results[0].value)
+      .toHaveBeenCalledWith(definition.operation, await fixtures.bridge.request.mock.results[0].value)
   })
 })

package/types/reflection.d.ts

@@ -1,16 +1,14 @@
-// noinspection ES6UnusedImports
-
-import { Connector } from './connector'
+import * as _core from './connector'
 
 declare namespace toa.core {
 
-    namespace reflection {
-        type Source = () => Promise<any>
-    }
+  namespace reflection {
+    type Source = () => Promise<any>
+  }
 
-    interface Reflection<T> extends Connector {
-        value: T
-    }
+  interface Reflection<T> extends _core.Connector {
+    value: T
+  }
 }
 
 export type Source = toa.core.reflection.Source

package/types/request.d.ts

@@ -17,6 +17,7 @@ declare namespace toa.core {
   type Request = {
     input?: any
     query?: request.Query
+    authentic?: boolean
   }
 
 }