@toa.io/norm 0.10.1-dev.0 → 1.0.0-dev.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "0.10.1-dev.0",
+  "version": "1.0.0-dev.1",
   "description": "Toa declarations normalization and validation",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,14 +19,14 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "devDependencies": {
-    "@toa.io/mock": "0.7.7-dev.0"
+    "@toa.io/mock": "0.7.7-dev.2"
   },
   "dependencies": {
-    "@toa.io/core": "0.8.1",
-    "@toa.io/generic": "0.9.0",
-    "@toa.io/schema": "0.7.3",
-    "@toa.io/schemas": "0.8.1",
-    "@toa.io/yaml": "0.7.3"
+    "@toa.io/core": "1.0.0-dev.1",
+    "@toa.io/generic": "0.9.1-dev.0",
+    "@toa.io/schema": "0.7.4-dev.1",
+    "@toa.io/schemas": "0.8.2-dev.1",
+    "@toa.io/yaml": "0.7.4-dev.1"
   },
-  "gitHead": "7f1fdbfe3aa33eb4a06cb1a33d15be18854bcd88"
+  "gitHead": "1121d84f7051a0d54ecf899efeaf3b328d7894c0"
 }

package/src/.component/.expand/receivers.js

@@ -6,7 +6,7 @@ function receivers (manifest) {
   if (manifest.receivers === undefined) return
 
   for (const [locator, receiver] of Object.entries(manifest.receivers)) {
-    if (typeof receiver === 'string') manifest.receivers[locator] = { transition: receiver }
+    if (typeof receiver === 'string') manifest.receivers[locator] = { operation: receiver }
 
     if (receiver.binding !== undefined) receiver.binding = resolve(receiver.binding)
     if (receiver.bridge !== undefined) receiver.bridge = resolve(receiver.bridge)

package/src/.component/schema.yaml

@@ -207,7 +207,7 @@ properties:
       '.*':
         type: object
         properties:
-          transition:
+          operation:
             $ref: 'definitions#/definitions/token'
           bridge:
             type: string
@@ -223,7 +223,7 @@ properties:
           adaptive:
             type: boolean
             default: false
-        required: [ transition, bridge, path ]
+        required: [ operation ]
         additionalProperties: false
 
   extensions:

package/src/.component/validate.js

@@ -27,14 +27,16 @@ const events = (manifest) => {
 
 const receivers = (manifest) => {
   for (const [locator, receiver] of Object.entries(manifest.receivers)) {
-    if (manifest.operations?.[receiver.transition] === undefined) {
-      throw new Error(`Receiver '${locator}' refers to undefined transition '${receiver.transition}'`)
+    if (manifest.operations?.[receiver.operation] === undefined) {
+      throw new Error(`Receiver '${locator}' refers to undefined operation '${receiver.operation}'`)
     }
 
-    if (manifest.operations[receiver.transition].type !== 'transition') {
-      throw new Error(`Receiver '${locator}' refers to non-transition '${receiver.transition}'`)
+    if (!TYPES.has(manifest.operations[receiver.operation].type)) {
+      throw new Error(`Receiver '${locator}' must refer to an operation of one of the allowed types: ${Array.from(TYPES).join(', ')}`)
     }
   }
 }
 
+const TYPES = new Set(['transition', 'effect'])
+
 exports.validate = validate

package/test/component/expand.fixtures.js

@@ -53,7 +53,7 @@ const source = {
     two: {
       binding: 'amqp',
       bridge: 'node',
-      transition: 'transit'
+      operation: 'transit'
     }
   }
 }
@@ -123,12 +123,12 @@ const target = {
   },
   receivers: {
     one: {
-      transition: 'transit'
+      operation: 'transit'
     },
     two: {
       bridge: '@toa.io/bridges.node',
       binding: '@toa.io/bindings.amqp',
-      transition: 'transit'
+      operation: 'transit'
     }
   }
 }

package/test/component/validate.fixtures.js

@@ -47,7 +47,7 @@ const ok = {
   },
   receivers: {
     'foo.bar.happened': {
-      transition: 'add',
+      operation: 'add',
       bridge: 'whatever',
       binding: 'amqp',
       path: '/somewhere'

package/test/component/validate.test.js

@@ -229,15 +229,15 @@ describe('operations', () => {
 })
 
 describe('receivers', () => {
-  it('should throw if transition points to undefined transition', () => {
-    manifest.receivers['foo.bar.happened'].transition = 'not-exists'
+  it('should throw if transition points to undefined operation', () => {
+    manifest.receivers['foo.bar.happened'].operation = 'not-exists'
 
-    expect(() => validate(manifest)).toThrow(/refers to undefined transition/)
+    expect(() => validate(manifest)).toThrow(/refers to undefined operation/)
   })
 
-  it('should throw if transition points to non transition', () => {
-    manifest.receivers['foo.bar.happened'].transition = 'get'
+  it('should throw if transition points to observation', () => {
+    manifest.receivers['foo.bar.happened'].operation = 'get'
 
-    expect(() => validate(manifest)).toThrow(/refers to non-transition/)
+    expect(() => validate(manifest)).toThrow(/one of the allowed types/)
   })
 })

package/types/component.d.ts

@@ -1,4 +1,4 @@
-import type { Locator } from '@toa.io/core/types'
+import type {Locator} from '@toa.io/core/types'
 
 export namespace toa.norm {
 
@@ -36,7 +36,7 @@ export namespace toa.norm {
     }
 
     interface Receiver {
-      transition: string
+      operation: string
       adaptive: boolean
       conditioned: boolean
       bridge: string