@toa.io/norm 0.9.0 → 0.10.0-dev.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "0.9.0",
+  "version": "0.10.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.5"
+    "@toa.io/mock": "0.7.6-dev.1"
   },
   "dependencies": {
     "@toa.io/core": "0.8.0",
     "@toa.io/generic": "0.8.0",
-    "@toa.io/schema": "0.7.2",
-    "@toa.io/schemas": "0.8.0",
+    "@toa.io/schema": "0.7.3-dev.0",
+    "@toa.io/schemas": "0.8.1-dev.0",
     "@toa.io/yaml": "0.7.2"
   },
-  "gitHead": "e0f4773f67000b28d5b332ce0a0094a31acf4ff3"
+  "gitHead": "cec62c1e23f4f16baff9baf6e71935ecccf786e5"
 }

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

@@ -3,7 +3,9 @@
 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/receivers.js

@@ -0,0 +1,20 @@
+'use strict'
+
+function receivers (component) {
+  if (component.receivers === undefined) return
+
+  const receivers = component.receivers
+
+  for (const [key, value] of Object.entries(receivers)) {
+    const segments = key.split('.')
+
+    if (segments.length === 3) continue
+
+    const newKey = 'default.' + key
+
+    delete receivers[key]
+    receivers[newKey] = value
+  }
+}
+
+exports.receivers = receivers

package/src/.component/dereference.js

@@ -32,7 +32,7 @@ const resolve = (schema) => (property) => {
 }
 
 const schema = (object, resolve) => {
-  if (object === undefined || typeof object !== 'object') return
+  if (object === undefined || object === null || typeof object !== 'object') return
   if (object.type === 'string' && object.default?.[0] === '.') return resolve(object.default.substring(1))
 
   if (object.type === 'array') {

package/src/.component/normalize.js

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

package/src/.component/schema.yaml

@@ -41,10 +41,10 @@ properties:
 
   namespace:
     $ref: 'definitions#/definitions/token'
+    default: 'default'
     not:
       oneOf:
         - const: 'system'
-        - const: 'default'
   name:
     $ref: 'definitions#/definitions/token'
 
@@ -63,19 +63,16 @@ properties:
           type:
             default: object
             const: object
-          additionalProperties:
-            default: false
-            const: false
           properties:
             type: object
             propertyNames:
               oneOf:
                 - $ref: 'definitions#/definitions/token'
-                - enum: [_version]
+                - enum: [ _version ]
       initialized:
         type: boolean
         default: false
-    required: [schema]
+    required: [ schema ]
     additionalProperties: false
 
   bindings:
@@ -97,11 +94,11 @@ properties:
         type: object
         properties:
           type:
-            enum: [transition, observation, assignment, computation, effect]
+            enum: [ transition, observation, assignment, computation, effect ]
           scope:
-            enum: [object, objects, changeset, none]
+            enum: [ object, objects, changeset, none ]
           concurrency:
-            enum: [none, retry]
+            enum: [ none, retry ]
           forward:
             $ref: 'definitions#/definitions/token'
           bridge:
@@ -110,16 +107,11 @@ properties:
             $ref: '#/properties/bindings'
           input:
             $ref: 'definitions#/definitions/schema'
-            not:
-              properties:
-                additionalProperties:
-                  const: true
-              required: [additionalProperties]
           output:
             $ref: 'definitions#/definitions/schema'
           query:
             type: boolean
-        required: [type, scope, bindings]
+        required: [ type, scope, bindings ]
         allOf:
           - if: # transition
               properties:
@@ -128,15 +120,15 @@ properties:
             then:
               properties:
                 scope:
-                  enum: [object]
+                  enum: [ object ]
               if: # transition query: false
                 not:
                   properties:
                     query:
                       const: false
-                  required: [query]
+                  required: [ query ]
               then:
-                required: [concurrency]
+                required: [ concurrency ]
           - if: # not transition
               not:
                 properties:
@@ -153,7 +145,7 @@ properties:
             then:
               properties:
                 scope:
-                  enum: [object, objects, none]
+                  enum: [ object, objects, none ]
                 query:
                   not:
                     const: false
@@ -164,7 +156,7 @@ properties:
             then:
               properties:
                 scope:
-                  enum: [changeset]
+                  enum: [ changeset ]
           - if: # computation
               properties:
                 type:
@@ -206,7 +198,7 @@ properties:
           subjective:
             type: boolean
             default: false
-        required: [bridge, path]
+        required: [ bridge, path ]
         additionalProperties: false
 
   receivers:
@@ -231,7 +223,7 @@ properties:
           adaptive:
             type: boolean
             default: false
-        required: [transition, bridge, path]
+        required: [ transition, bridge, path ]
         additionalProperties: false
 
   extensions:

package/src/component.js

@@ -26,6 +26,8 @@ const component = async (path) => {
   normalize(manifest, process.env.TOA_ENV)
   validate(manifest)
 
+  manifest.locator = new Locator(manifest.name, manifest.namespace)
+
   return manifest
 }
 
@@ -43,8 +45,6 @@ const load = async (path, base) => {
   await merge(path, manifest)
 
   if (manifest.prototype !== null) {
-    manifest.locator = new Locator(manifest.name, manifest.namespace)
-
     const prototype = await load(manifest.prototype, path)
 
     collapse(manifest, prototype)

package/test/component/normalize.test.js

@@ -43,3 +43,17 @@ describe('extensions', () => {
     expect(() => normalize(manifest)).toThrow(/hasn't returned manifest/)
   })
 })
+
+describe('receivers', () => {
+  it('should substitute default namespace', async () => {
+    manifest.receivers = {
+      'messages.created': 'add'
+    }
+
+    normalize(manifest)
+
+    expect(manifest.receivers).toStrictEqual({
+      'default.messages.created': 'add'
+    })
+  })
+})

package/test/component/validate.test.js

@@ -55,9 +55,11 @@ describe('namespace', () => {
     expect(() => validate(manifest)).toThrow(/must NOT be valid/)
   })
 
-  it('should forbid \'default\' namespace', () => {
-    manifest.namespace = 'default'
-    expect(() => validate(manifest)).toThrow(/must NOT be valid/)
+  it('should set `default` namespace', async () => {
+    delete manifest.namespace
+
+    expect(() => validate(manifest)).not.toThrow()
+    expect(manifest.namespace).toStrictEqual('default')
   })
 })