@toa.io/norm 0.6.0-dev.0 → 0.6.0-dev.3

package/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2020-present Artem Gurtovoi
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/features/component.operations.feature

@@ -11,13 +11,13 @@ Feature: Operations declaration
       foo: string
       bar: 1
       """
-    When I declare operation assignment with:
+    When I declare assignment with:
       """
       <channel>:
         foo: .
         baz: .bar
       """
-    Then normalized operation assignment declaration must contain:
+    Then normalized assignment declaration must contain:
       """
       <channel>:
         type: object
@@ -38,13 +38,13 @@ Feature: Operations declaration
 
   Operation IO schemas must be able to reference prototype's entity properties.
 
-    When I declare operation assignment with:
+    When I declare assignment with:
       """
       output:
         id: .
       """
 
-    Then normalized operation assignment declaration must contain:
+    Then normalized assignment declaration must contain:
       """
       output:
         type: object
@@ -52,43 +52,3 @@ Feature: Operations declaration
           id:
             $ref: https://schemas.toa.io/0.0.0/definitions#/definitions/id
       """
-
-  Scenario: A receiver with binding should contain 'foreign=true'
-    When I declare operation transition with:
-      """
-      concurrency: none
-      output: null
-      """
-    When I declare receiver for profile.updated with:
-      """
-      path: ''
-      bridge: node
-      binding: amqp
-      transition: transition
-      """
-
-    Then normalized receiver for event profile.updated must contain:
-      """
-      foreign: true
-      """
-
-  Scenario: Receiver foreign property should not change if set:
-    When I declare operation transition with:
-      """
-      concurrency: none
-      output: null
-      """
-
-    When I declare receiver for profile.updated with:
-      """
-      path: ''
-      foreign: false
-      bridge: node
-      binding: amqp
-      transition: transition
-      """
-
-    Then normalized receiver for event profile.updated must contain:
-      """
-      foreign: false
-      """

package/features/steps/.test/manifest.test.js

@@ -41,8 +41,8 @@ describe('Given I have an entity schema:', () => {
   })
 })
 
-describe('When I declare operation {operation} with:', () => {
-  const step = gherkin.steps.Wh('I declare operation {operation} with:')
+describe('When I declare {operation} with:', () => {
+  const step = gherkin.steps.Wh('I declare {operation} with:')
 
   it('should be', () => undefined)
 
@@ -58,84 +58,8 @@ describe('When I declare operation {operation} with:', () => {
   })
 })
 
-describe('When I declare receiver for {label} with:', () => {
-  const step = gherkin.steps.Wh('I declare receiver for {label} with:')
-
-  it('should be', () => undefined)
-
-  it('should declare receiver', () => {
-    const event = 'assignment'
-    const input = { binding: 'amqp' }
-    const yaml = dump(input)
-
-    step.call(context, event, yaml)
-
-    expect(context.manifest.receivers[event]).toStrictEqual(input)
-  })
-
-})
-
-describe('Then normalized receiver for event {label} must contain:', () => {
-  const step = gherkin.steps.Th('normalized receiver for event {label} must contain:')
-
-  it('should be', () => undefined)
-
-  it('should throw if does not contain', async () => {
-    const label = generate()
-    const operation = 'save'
-
-    context.manifest.operations = {
-      [operation]: {
-        type: 'transition',
-        scope: 'object',
-        concurrency: 'none'
-      }
-    }
-
-    context.manifest.receivers = {
-      [label]: {
-        path: '',
-        bridge: 'node',
-        transition: operation,
-        binding: 'amqp'
-      }
-    }
-
-    const input = { binding: 'kafka' }
-    const yaml = dump({ input })
-
-    await expect(step.call(context, label, yaml)).rejects.toThrow(AssertionError)
-  })
-
-  it('should not throw if contain', async () => {
-    const label = generate()
-    const operation = generate()
-
-    context.manifest.operations = {
-      [operation]: {
-        type: 'transition',
-        scope: 'object',
-        concurrency: 'none'
-      }
-    }
-
-    context.manifest.receivers = {
-      [label]: {
-        path: '',
-        bridge: 'node',
-        transition: operation,
-        binding: 'amqp'
-      }
-    }
-
-    const yaml = dump({ transition: operation })
-
-    await expect(step.call(context, label, yaml)).resolves.not.toThrow()
-  })
-})
-
-describe('Then normalized operation {operation} declaration must contain:', () => {
-  const step = gherkin.steps.Th('normalized operation {operation} declaration must contain:')
+describe('Then normalized {operation} declaration must contain:', () => {
+  const step = gherkin.steps.Th('normalized {operation} declaration must contain:')
 
   it('should be', () => undefined)
 

package/features/steps/manifest.js

@@ -10,26 +10,6 @@ const { component: load } = require('../../src')
 
 const { Given, When, Then } = require('@cucumber/cucumber')
 
-/**
- * @param variant {'operations'| 'receivers'}
- * @param type {string}
- * @param yaml {string}
- * @return {Promise<void>}
- */
-async function checkManifest (variant, type, yaml) {
-  const temp = await directory.temp()
-  const path = join(temp, 'manifest.toa.yaml')
-
-  await save(this.manifest, path)
-
-  const manifest = await load(temp)
-  const operation = manifest[variant][type]
-  const query = parse(yaml)
-  const contains = match(operation, query)
-
-  assert.equal(contains, true)
-}
-
 Given('I have an entity schema:',
   /**
    * @param {string} yaml
@@ -41,7 +21,7 @@ Given('I have an entity schema:',
     this.manifest.entity = { schema }
   })
 
-When('I declare operation {operation} with:',
+When('I declare {operation} with:',
   /**
    * @param {toa.norm.component.operations.Type} type
    * @param {string} yaml
@@ -57,31 +37,24 @@ When('I declare operation {operation} with:',
     this.manifest.operations = { [type]: declaration }
   })
 
-When('I declare receiver for {label} with:',
-  async function (label, yaml) {
-    const declaration = parse(yaml)
-
-    this.manifest.receivers = { [label]: declaration }
-  })
-
-Then('normalized operation {operation} declaration must contain:',
+Then('normalized {operation} declaration must contain:',
   /**
    * @param {toa.norm.component.operations.Type} type
    * @param {string} yaml
    * @this {toa.norm.features.Context}
    */
   async function (type, yaml) {
-    await checkManifest.call(this, 'operations', type, yaml)
-  })
+    const temp = await directory.temp()
+    const path = join(temp, 'manifest.toa.yaml')
 
-Then('normalized receiver for event {label} must contain:',
-  /**
-   * @param {string} label
-   * @param {string} yaml
-   * @this {toa.norm.features.Context}
-   */
-  async function (label, yaml) {
-    await checkManifest.call(this, 'receivers', label, yaml)
+    await save(this.manifest, path)
+
+    const manifest = await load(temp)
+    const operation = manifest.operations[type]
+    const query = parse(yaml)
+    const contains = match(operation, query)
+
+    assert.equal(contains, true)
   })
 
 /**

package/features/steps/parameters.js

@@ -7,9 +7,3 @@ defineParameterType({
   regexp: /transition|observation|assignment/,
   transformer: (type) => type
 })
-
-defineParameterType({
-  name: 'label',
-  regexp: /\S+/,
-  transformer: (name) => name
-})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "0.6.0-dev.0",
+  "version": "0.6.0-dev.3",
   "description": "Toa declarations normalization and validation",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,13 +19,14 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "devDependencies": {
-    "@toa.io/mock": "0.6.0-dev.0"
+    "@toa.io/mock": "0.6.0-dev.3"
   },
   "dependencies": {
-    "@toa.io/core": "0.6.0-dev.0",
-    "@toa.io/generic": "0.6.0-dev.0",
-    "@toa.io/schema": "0.6.0-dev.0",
-    "@toa.io/schemas": "0.6.0-dev.0",
-    "@toa.io/yaml": "0.6.0-dev.0"
-  }
+    "@toa.io/core": "0.6.0-dev.3",
+    "@toa.io/generic": "0.6.0-dev.1",
+    "@toa.io/schema": "0.6.0-dev.1",
+    "@toa.io/schemas": "0.6.0-dev.1",
+    "@toa.io/yaml": "0.6.0-dev.1"
+  },
+  "gitHead": "08ffb832d6593ec1b42bff71cfbfd8fcd871c501"
 }

package/src/.component/.normalize/index.js

@@ -3,9 +3,7 @@
 const { events } = require('./events')
 const { extensions } = require('./extensions')
 const { operations } = require('./operations')
-const { receivers } = require('./receivers');
 
 exports.events = events
 exports.extensions = extensions
 exports.operations = operations
-exports.receivers = receivers

package/src/.component/normalize.js

@@ -1,14 +1,13 @@
 'use strict'
 
 const { convolve } = require('@toa.io/generic')
-const { events, operations, extensions, receivers } = require('./.normalize')
+const { events, operations, extensions } = require('./.normalize')
 
 const normalize = (component, environment) => {
   convolve(component, environment)
   operations(component)
   events(component)
   extensions(component)
-  receivers(component)
 }
 
 exports.normalize = normalize

package/src/.component/schema.yaml

@@ -213,9 +213,7 @@ properties:
           adaptive:
             type: boolean
             default: false
-          foreign:
-            type: boolean
-        required: [transition, bridge, path, foreign]
+        required: [transition, bridge, path]
         additionalProperties: false
 
   extensions:

package/test/component/validate.fixtures.js

@@ -47,7 +47,6 @@ const ok = {
   },
   receivers: {
     'foo.bar.happened': {
-      foreign: true,
       transition: 'add',
       bridge: 'whatever',
       binding: 'amqp',

package/types/component.d.ts

@@ -42,7 +42,6 @@ export namespace toa.norm {
       bridge: string
       binding: string
       path: string
-      foreign: boolean
     }
 
     type Entity = {

package/src/.component/.normalize/receivers.js

@@ -1,11 +0,0 @@
-'use strict'
-
-const receivers = (component) => {
-  if (component.receivers === undefined) return
-
-  for (const receiver of Object.values(component.receivers)) {
-    if (receiver.foreign === undefined) receiver.foreign = receiver.binding !== undefined
-  }
-}
-
-exports.receivers = receivers