@toa.io/norm 0.20.0-alpha.1 → 0.20.0-alpha.2

package/package.json

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

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

@@ -9,6 +9,7 @@ function extensions (manifest) {
 
 const SHORTCUTS = {
   exposition: '@toa.io/extensions.exposition',
+  realtime: '@toa.io/extensions.realtime',
   origins: '@toa.io/extensions.origins',
   configuration: '@toa.io/extensions.configuration',
   state: '@toa.io/extensions.state',

package/src/.component/.expand/operations.js

@@ -10,7 +10,10 @@ function operations (manifest) {
     if (operation.input !== undefined) operation.input = expand(operation.input)
     if (operation.output !== undefined) operation.output = expand(operation.output)
     if (operation.bridge !== undefined) operation.bridge = resolve(operation.bridge)
-    if (operation.bindings !== undefined) operation.bindings = operation.bindings.map(resolve)
+
+    if (operation.bindings !== undefined && operation.bindings !== null) {
+      operation.bindings = operation.bindings.map(resolve)
+    }
   }
 }
 

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

@@ -1,11 +1,9 @@
 'use strict'
 
 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/operations.js

@@ -4,7 +4,11 @@ const operations = (component) => {
   if (component.operations === undefined) return
 
   for (const [endpoint, operation] of Object.entries(component.operations)) {
+    if (operation.type === 'computation' || operation.type === 'effect')
+      operation.query = false
+
     if (operation.bindings === undefined) operation.bindings = component.bindings
+    if (operation.bindings === null) operation.bindings = []
     if (operation.virtual === true) delete component.operations[endpoint]
   }
 }

package/src/.component/{.normalize/extensions.js → extensions.js}

@@ -1,11 +1,8 @@
 'use strict'
 
 const { directory: { find } } = require('@toa.io/filesystem')
-const { resolve } = require('../../shortcuts')
+const { resolve } = require('../shortcuts')
 
-/**
- * @param {toa.norm.Component} manifest
- */
 const extensions = (manifest) => {
   if (manifest.extensions === undefined) return
 

package/src/.component/index.js

@@ -8,6 +8,7 @@ const { expand } = require('./expand')
 const { merge } = require('./merge')
 const { normalize } = require('./normalize')
 const { validate } = require('./validate')
+const { extensions } = require('./extensions')
 
 exports.collapse = collapse
 exports.defaults = defaults
@@ -17,3 +18,4 @@ exports.expand = expand
 exports.merge = merge
 exports.normalize = normalize
 exports.validate = validate
+exports.extensions = extensions

package/src/.component/normalize.js

@@ -1,12 +1,11 @@
 'use strict'
 
-const { events, operations, extensions, receivers } = require('./.normalize')
+const { events, operations, receivers } = require('./.normalize')
 
-const normalize = (component, environment) => {
+const normalize = (component) => {
   operations(component)
   events(component)
   receivers(component)
-  extensions(component)
 }
 
 exports.normalize = normalize

package/src/.component/schema.yaml

@@ -79,7 +79,6 @@ properties:
   bindings:
     type: array
     uniqueItems: true
-    minItems: 1
     items:
       $ref: '#/definitions/binding'
 
@@ -167,6 +166,9 @@ properties:
                 scope:
                   const: none
                   default: none
+                query:
+                  const: false
+                  default: false
           - if: # effect
               properties:
                 type:
@@ -176,6 +178,9 @@ properties:
                 scope:
                   const: none
                   default: none
+                query:
+                  const: false
+                  default: false
         additionalProperties: false
     additionalProperties: false
 

package/src/component.js

@@ -14,17 +14,16 @@ const {
   dereference,
   defaults,
   dependencies,
-  normalize
+  normalize,
+  extensions
 } = require('./.component')
 
-/**
- * @type {toa.norm.component.Constructor}
- */
 const component = async (path) => {
   const manifest = await load(path)
 
-  normalize(manifest, process.env.TOA_ENV)
+  normalize(manifest)
   validate(manifest)
+  extensions(manifest)
 
   manifest.locator = new Locator(manifest.name, manifest.namespace)
 

package/src/shortcuts.js

@@ -46,6 +46,7 @@ const SHORTCUTS = {
   sql: '@toa.io/storages.sql',
   queues: '@toa.io/storages.queues',
   exposition: '@toa.io/extensions.exposition',
+  realtime: '@toa.io/extensions.realtime',
   configuration: '@toa.io/extensions.configuration',
   origins: '@toa.io/extensions.origins',
   stash: '@toa.io/extensions.stash'

package/test/component/normalize.test.js

@@ -29,12 +29,6 @@ describe('extensions', () => {
 
     expect(manifest.extensions[path]).toStrictEqual(origins)
   })
-
-  it('should throw if manifest is undefined', () => {
-    manifest.extensions['./dummies/extension'].ok = false
-
-    expect(() => normalize(manifest)).toThrow(/hasn't returned manifest/)
-  })
 })
 
 describe('receivers', () => {

package/test/component/validate.fixtures.js

@@ -34,6 +34,16 @@ const ok = {
       scope: 'changeset',
       bridge: 'whatever',
       bindings: ['@toa.io/bindings.http', '@toa.io/bindings.amqp']
+    },
+    compute: {
+      type: 'computation',
+      bridge: 'whatever',
+      bindings: ['@toa.io/bindings.http', '@toa.io/bindings.amqp']
+    },
+    affect: {
+      type: 'effect',
+      bridge: 'whatever',
+      bindings: ['@toa.io/bindings.http', '@toa.io/bindings.amqp']
     }
   },
   events: {

package/test/component/validate.test.js

@@ -172,6 +172,15 @@ describe('operations', () => {
     expect(() => validate(manifest)).toThrow(/must NOT be valid/)
   })
 
+  it.each([
+    ['computation', 'compute'],
+    ['effect', 'affect']
+  ])('should set query: false for %s', async (_, operation) => {
+    validate(manifest)
+
+    expect(manifest.operations[operation].query).toBe(false)
+  })
+
   describe('scope', () => {
     it('should have scope', () => {
       delete manifest.operations.get.scope

package/types/component.d.ts

@@ -11,6 +11,7 @@ type Operation = {
   input?: any
   output?: any
   error?: any
+  query?: boolean
 }
 
 type Operations = {