@toa.io/core 0.24.0-alpha.21 → 0.24.0-alpha.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/core",
-  "version": "0.24.0-alpha.21",
+  "version": "0.24.0-alpha.23",
   "description": "Toa Core",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -12,7 +12,7 @@
     "url": "https://github.com/toa-io/toa/issues"
   },
   "main": "src/index.js",
-  "types": "types/index.d.ts",
+  "types": "types/index.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@rsql/parser": "1.2.4",
-    "@toa.io/console": "0.24.0-alpha.21",
-    "@toa.io/generic": "0.24.0-alpha.21",
-    "@toa.io/yaml": "0.24.0-alpha.21",
+    "@toa.io/console": "0.24.0-alpha.23",
+    "@toa.io/generic": "0.24.0-alpha.23",
+    "@toa.io/yaml": "0.24.0-alpha.23",
     "error-value": "0.3.0"
   },
   "devDependencies": {
     "clone-deep": "4.0.1"
   },
-  "gitHead": "b30bbcf178be9339914e2e5203c61c0da2c3daf2"
+  "gitHead": "df9de3cbb530e8f985a660bca0bf65bd027dbb01"
 }

package/src/contract/request.js

@@ -29,11 +29,11 @@ class Request extends Conditions {
     if (entity === undefined)
       definition.query = false
 
-    if (definition.query === true) required.push('query')
+    if (definition.query === true)
+      required.push('query')
 
-    if (definition.query === false) {
-      schema.not = { required: ['query'] }
-    }
+    if (definition.query === false)
+      schema.properties.query = { type: 'null' }
 
     if (definition.query !== false) {
       const query = structuredClone(schemas.query)
@@ -57,7 +57,8 @@ class Request extends Conditions {
       schema.properties.query = query
     }
 
-    if (required.length > 0) schema.required = required
+    if (required.length > 0)
+      schema.required = required
 
     return schema
   }

package/test/contract/request.test.js

@@ -58,8 +58,7 @@ describe('schema', () => {
   })
 
   it('should not contain query if declaration.query is false', () => {
-    delete schema.properties.query
-    schema.not = { required: ['query'] }
+    schema.properties.query = { type: 'null' }
     expect(Request.schema({ query: false }, dummy)).toStrictEqual(schema)
   })
 

package/types/bridges.ts

@@ -0,0 +1,30 @@
+import type { Request, Reply } from './request'
+import type { Context } from './context'
+
+export interface Algorithm {
+  mount: (context?: Context) => Promise<void>
+
+  execute: ((input: any, scope: object | object[]) => Promise<Reply>) |
+  ((input: any) => Promise<Reply>) |
+  (() => Promise<Reply>)
+}
+
+export interface Event {
+  condition: (object: object) => Promise<boolean>
+
+  payload: (object: object) => Promise<object>
+}
+
+export interface Receiver {
+  condition: (object: object) => Promise<boolean>
+
+  request: (object: object) => Promise<Request>
+}
+
+export interface Factory {
+  algorithm?: (path: string, name: string, context: Context) => Algorithm
+
+  event?: (path: string, label: string) => Event
+
+  receiver?: (path: string, label: string) => Receiver
+}

package/types/context.d.ts

@@ -3,25 +3,19 @@ import * as _reply from './reply'
 import * as _extensions from './extensions'
 import * as _connector from './connector'
 
-declare namespace toa.core {
+export interface Context extends _connector.Connector{
+  aspects: _extensions.Aspect[]
 
-  interface Context extends _connector.Connector {
-    aspects: _extensions.Aspect[]
+  /**
+   * Calls local endpoint
+   */
+  apply (endpoint: string, request: _request.Request): Promise<_reply.Reply>
 
-    /**
-     * Calls local endpoint
-     */
-    apply(endpoint: string, request: _request.Request): Promise<_reply.Reply>
-
-    /**
-     * Calls remote endpoint
-     */
-    call(namespace: string, name: string, endpoint: string, request: _request.Request): Promise<_reply.Reply>
-
-    // shortcuts
-    [key: string]: any
-  }
+  /**
+   * Calls remote endpoint
+   */
+  call (namespace: string, name: string, endpoint: string, request: _request.Request): Promise<_reply.Reply>
 
+  // shortcuts
+  [key: string]: any
 }
-
-export type Context = toa.core.Context

package/types/{index.d.ts → index.ts}

@@ -4,11 +4,11 @@ export * as storages from './storages'
 export * as bridges from './bridges'
 export * as operations from './operations'
 
-export { Component } from './component'
+export type { Component } from './component'
 export { Connector } from './connector'
-export { Context } from './context'
-export { Exception } from './exception'
+export type { Context } from './context'
+export type { Exception } from './exception'
 export { Locator } from './locator'
-export { Receiver } from './receiver'
-export { Message } from './message'
-export { Request, Query, Reply } from './request'
+export type { Receiver } from './receiver'
+export type { Message } from './message'
+export type { Request, Query, Reply } from './request'

package/types/bridges.d.ts

@@ -1,41 +0,0 @@
-import * as _core from '@toa.io/core/types'
-import type * as reply from './reply'
-import type * as context from './context'
-import type * as connector from './connector'
-
-declare namespace toa.core.bridges {
-
-  interface Algorithm extends connector.Connector {
-    mount(context?: context.Context): Promise<void>
-
-    execute(input: any, scope: object | object[]): Promise<reply.Reply>
-
-    execute(input: any): Promise<reply.Reply>
-
-    execute(): Promise<reply.Reply>
-  }
-
-  interface Event {
-    condition(object): Promise<boolean>
-
-    payload(object): Promise<object>
-  }
-
-  interface Receiver {
-    condition(object): Promise<boolean>
-
-    request(object): Promise<_core.Request>
-  }
-
-  interface Factory {
-    algorithm(path: string, name: string, context: context.Context): Algorithm
-
-    event(path: string, label: string): Event
-
-    receiver(path: string, label: string): Receiver
-  }
-
-}
-
-export type Algorithm = toa.core.bridges.Algorithm
-export type Factory = toa.core.bridges.Factory