@toa.io/core 0.20.0-dev.2 → 0.20.0-dev.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/core",
-  "version": "0.20.0-dev.2",
+  "version": "0.20.0-dev.20",
   "description": "Toa Core",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -12,6 +12,7 @@
     "url": "https://github.com/toa-io/toa/issues"
   },
   "main": "src/index.js",
+  "types": "types/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -20,10 +21,10 @@
   },
   "dependencies": {
     "@rsql/parser": "1.2.4",
-    "@toa.io/console": "0.20.0-dev.2",
-    "@toa.io/generic": "0.20.0-dev.2",
-    "@toa.io/yaml": "0.20.0-dev.2",
+    "@toa.io/console": "0.20.0-dev.20",
+    "@toa.io/generic": "0.20.0-dev.20",
+    "@toa.io/yaml": "0.20.0-dev.20",
     "clone-deep": "4.0.1"
   },
-  "gitHead": "3e767a32bf4705bacee7b2e8312ed0b0805a5260"
+  "gitHead": "52c962bc17b71f3e7890ec53870f8b93fda720a0"
 }

package/src/call.js

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

package/src/contract/request.js

@@ -13,7 +13,7 @@ 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) {

package/src/observation.js

@@ -14,6 +14,11 @@ class Observation extends Operation {
     store.scope = scope
     store.state = state
   }
+
+  async run (store) {
+    if (store.scope === null) store.reply = null
+    else await super.run(store)
+  }
 }
 
 exports.Observation = Observation

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/state.js

@@ -41,10 +41,10 @@ class State {
     if (record === null) {
       if (this.#initialized && query.id !== undefined && query.version === undefined) return this.init(query.id)
       else if (query.version !== undefined) throw new StatePreconditionException()
-      else throw new StateNotFoundException()
     }
 
-    return this.#entity.object(record)
+    if (record === null) return null
+    else return this.#entity.object(record)
   }
 
   async objects (query) {

package/src/transition.js

@@ -3,7 +3,7 @@
 const { retry } = require('@toa.io/generic')
 
 const { Operation } = require('./operation')
-const { StateConcurrencyException } = require('./exceptions')
+const { StateConcurrencyException, StateNotFoundException } = require('./exceptions')
 
 class Transition extends Operation {
   #concurrency
@@ -22,6 +22,9 @@ class Transition extends Operation {
     const { request } = store
 
     store.scope = request.query ? await this.query(request.query) : this.scope.init()
+
+    if (store.scope === null) throw new StateNotFoundException()
+
     store.state = store.scope.get()
   }
 

package/test/call.test.js

@@ -1,10 +1,10 @@
 'use strict'
 
+jest.mock('../src/connector')
+
 const { Call } = require('../src/call')
 const fixtures = require('./call.fixtures')
 
-jest.mock('../src/connector')
-
 const { Connector } = require('../src/connector')
 
 let call

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/types/connector.d.ts

@@ -1,24 +1,18 @@
-declare namespace toa.core {
+export class Connector {
+  public id: string
+  public connected: boolean
 
-  interface Connector {
-    id: string
-    connected: boolean
+  public connect (): Promise<void>
 
-    depends(connector: Connector): Connector
+  public disconnect (interrupt?: boolean): Promise<void>
 
-    link(connector: Connector): void
+  protected depends (connector: Connector | Connector[]): Connector
 
-    connect(): Promise<void>
+  link (connector: Connector): void
 
-    disconnect(interrupt?: boolean): Promise<void>
+  protected open (): Promise<void>
 
-    open(): Promise<void>
-
-    close(): Promise<void>
-
-    dispose(): Promise<void>
-  }
+  protected close (): Promise<void>
 
+  protected dispose (): Promise<void>
 }
-
-export type Connector = toa.core.Connector

package/types/extensions.d.ts

@@ -7,21 +7,21 @@ import * as _bindings from './bindings'
 declare namespace toa.core.extensions {
 
   interface Factory {
-    tenant?(locator: _core.Locator, declaration: object): _core.Connector
+    tenant? (locator: _core.Locator, declaration: object): _core.Connector
 
-    aspect?(locator: _core.Locator, declaration: object): Aspect | Aspect[]
+    aspect? (locator: _core.Locator, declaration: object): Aspect | Aspect[]
 
-    service?(name?: string): _core.Connector
+    service? (name?: string): _core.Connector | null
 
-    component?(component: _component.Component): _component.Component
+    component? (component: _component.Component): _component.Component
 
-    context?(context: _context.Context): _context.Context
+    context? (context: _context.Context): _context.Context
 
-    storage?(storage: _storages.Storage): _storages.Storage
+    storage? (storage: _storages.Storage): _storages.Storage
 
-    emitter?(emitter: _bindings.Emitter, label: string): _bindings.Emitter
+    emitter? (emitter: _bindings.Emitter, label: string): _bindings.Emitter
 
-    receiver?(receiver: _core.Receiver, locator: _core.Locator): _core.Receiver
+    receiver? (receiver: _core.Receiver, locator: _core.Locator): _core.Receiver
   }
 
   interface Aspect extends _core.Connector {

package/types/index.d.ts

@@ -2,6 +2,7 @@ export * as bindings from './bindings'
 export * as extensions from './extensions'
 export * as storages from './storages'
 export * as bridges from './bridges'
+export * as operations from './operations'
 
 export { Component } from './component'
 export { Connector } from './connector'

package/types/locator.d.ts

@@ -1,16 +1,12 @@
-declare namespace toa.core {
+export class Locator {
+  public readonly name: string
+  public readonly namespace: string
 
-    interface Locator {
-        name: string
-        namespace: string
+  public readonly id: string
+  public readonly label: string
+  public readonly uppercase: string
 
-        id: string
-        label: string
-        uppercase: string
-
-        hostname(type?: string): string
-    }
+  constructor (name: string, namespace: string)
 
+  hostname (type?: string): string
 }
-
-export type Locator = toa.core.Locator

package/types/request.d.ts

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