@toa.io/norm 0.4.0-dev.2 → 0.4.0-dev.6

package/package.json

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

package/src/.component/.expand/extensions.js

@@ -3,8 +3,14 @@
 const { recognize } = require('../../shortcuts')
 
 function extensions (manifest) {
-  recognize(manifest, 'extensions')
-  recognize(manifest.extensions)
+  recognize(SHORTCUTS, manifest, 'extensions')
+  recognize(SHORTCUTS, manifest.extensions)
+}
+
+const SHORTCUTS = {
+  exposition: '@toa.io/extensions.exposition',
+  origins: '@toa.io/extensions.origins',
+  configuration: '@toa.io/extensions.configuration'
 }
 
 exports.extensions = extensions

package/src/.component/.expand/index.js

@@ -5,6 +5,7 @@ const { entity } = require('./entity')
 const { events } = require('./events')
 const { extensions } = require('./extensions')
 const { operations } = require('./operations')
+const { properties } = require('./properties')
 const { receivers } = require('./receivers')
 
 exports.bridge = bridge
@@ -12,4 +13,5 @@ exports.entity = entity
 exports.events = events
 exports.extensions = extensions
 exports.operations = operations
+exports.properties = properties
 exports.receivers = receivers

package/src/.component/.expand/properties.js

@@ -0,0 +1,14 @@
+'use strict'
+
+const { recognize } = require('../../shortcuts')
+
+function properties (manifest) {
+  recognize(SHORTCUTS, manifest, 'properties')
+  recognize(SHORTCUTS, manifest.properties)
+}
+
+const SHORTCUTS = {
+  queues: '@toa.io/storages.queues'
+}
+
+exports.properties = properties

package/src/.component/expand.js

@@ -1,6 +1,14 @@
 'use strict'
 
-const { entity, bridge, operations, events, receivers, extensions } = require('./.expand')
+const {
+  entity,
+  bridge,
+  operations,
+  events,
+  receivers,
+  extensions,
+  properties
+} = require('./.expand')
 
 const expand = (manifest) => {
   entity(manifest)
@@ -8,6 +16,7 @@ const expand = (manifest) => {
   operations(manifest)
   events(manifest)
   receivers(manifest)
+  properties(manifest)
   extensions(manifest)
 }
 

package/src/.component/schema.yaml

@@ -193,8 +193,6 @@ properties:
 
   receivers:
     type: object
-    propertyNames:
-      $ref: 'definitions#/definitions/endpoint'
     patternProperties:
       '.*':
         type: object
@@ -205,6 +203,8 @@ properties:
             type: string
           binding:
             type: string
+          source:
+            $ref: 'definitions#/definitions/token'
           path:
             type: string
           conditioned:
@@ -219,4 +219,7 @@ properties:
   extensions:
     type: object
 
+  properties:
+    type: object
+
 additionalProperties: false

package/src/.context/expand.js

@@ -1,14 +1,13 @@
 'use strict'
 
-const { recognize } = require('../shortcuts')
+const shortcuts = require('../shortcuts')
 
 /**
  * @param {toa.norm.context.Declaration | object} context
  */
 const expand = (context) => {
-  recognize(context, 'annotations')
-  recognize(context.annotations)
-
+  shortcuts.recognize(shortcuts.SHORTCUTS, context, 'annotations')
+  shortcuts.recognize(shortcuts.SHORTCUTS, context.annotations)
 }
 
 exports.expand = expand

package/src/shortcuts.js

@@ -16,15 +16,16 @@ const resolve = (token) => {
 /**
  * Finds object keys with known shortcuts, resolves and groups them to a given group key if provided
  *
+ * @param {Object} shortcuts
  * @param {Object} object
  * @param {string} [group]
  */
-const recognize = (object, group) => {
+const recognize = (shortcuts, object, group) => {
   if (object === undefined) return
 
   const target = group === undefined ? object : {}
 
-  for (const [alias, name] of Object.entries(SHORTCUTS)) {
+  for (const [alias, name] of Object.entries(shortcuts)) {
     const value = object[alias]
 
     if (value === undefined) continue
@@ -43,10 +44,11 @@ const SHORTCUTS = {
   node: '@toa.io/bridges.node',
   mongodb: '@toa.io/storages.mongodb',
   sql: '@toa.io/storages.sql',
+  queues: '@toa.io/storages.queues',
   exposition: '@toa.io/extensions.exposition',
-  origins: '@toa.io/extensions.origins',
   configuration: '@toa.io/extensions.configuration'
 }
 
 exports.recognize = recognize
 exports.resolve = resolve
+exports.SHORTCUTS = SHORTCUTS

package/test/component/expand.test.js

@@ -15,3 +15,14 @@ it('should expand', () => {
   expand(source)
   expect(source).toMatchObject(fixtures.target)
 })
+
+it('should recognize storages.queues', async () => {
+  const queues = { foo: 'bar' }
+
+  source.queues = clone(queues)
+
+  expand(source)
+
+  expect(source.queues).toBeUndefined()
+  expect(source.properties['@toa.io/storages.queues']).toMatchObject(queues)
+})

package/test/shortcuts.fixtures.js

@@ -6,9 +6,7 @@ const { random } = require('@toa.io/generic')
 const SHORTCUTS = {
   http: '@toa.io/bindings.http',
   amqp: '@toa.io/bindings.amqp',
-  mongodb: '@toa.io/storages.mongodb',
-  exposition: '@toa.io/extensions.exposition',
-  origins: '@toa.io/extensions.origins'
+  mongodb: '@toa.io/storages.mongodb'
 }
 
 const object = { foo: random(), bar: { baz: generate() } }

package/test/shortcuts.test.js

@@ -30,7 +30,7 @@ describe('resolve', () => {
 
 describe('recognize', () => {
   it('should not change unknown', () => {
-    recognize(object)
+    recognize(fixtures.SHORTCUTS, object)
 
     expect(object).toStrictEqual(fixtures.object)
   })
@@ -38,7 +38,7 @@ describe('recognize', () => {
   it('should resolve known', () => {
     const known = append()
 
-    recognize(object)
+    recognize(fixtures.SHORTCUTS, object)
 
     for (const [alias, name] of Object.entries(fixtures.SHORTCUTS)) {
       expect(object[alias]).toBeUndefined()
@@ -50,7 +50,7 @@ describe('recognize', () => {
     const known = append()
     const group = generate()
 
-    recognize(object, group)
+    recognize(fixtures.SHORTCUTS, object, group)
 
     expect(object[group]).toStrictEqual(known)
 
@@ -59,12 +59,13 @@ describe('recognize', () => {
 
   it('should not overwrite group', () => {
     append()
+
     const group = generate()
     const existing = { [generate()]: generate() }
 
     object[group] = clone(existing)
 
-    recognize(object, group)
+    recognize(fixtures.SHORTCUTS, object, group)
 
     expect(object[group]).toStrictEqual(expect.objectContaining(existing))
   })