@toa.io/norm 1.0.0-alpha.15 → 1.0.0-alpha.154

package/package.json

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

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

@@ -14,7 +14,8 @@ const SHORTCUTS = {
   configuration: '@toa.io/extensions.configuration',
   state: '@toa.io/extensions.state',
   stash: '@toa.io/extensions.stash',
-  storages: '@toa.io/extensions.storages'
+  storages: '@toa.io/extensions.storages',
+  mail: '@toa.io/extensions.mail'
 }
 
 exports.extensions = extensions

package/src/.component/.normalize/operations.js

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

package/src/.component/collapse.js

@@ -42,6 +42,11 @@ const collapse = (manifest, prototype) => {
     delete prototype.entity.schema.properties.id
   }
 
+  if (prototype.events !== undefined && manifest.events !== undefined)
+    for (const event of Object.keys(prototype.events))
+      if (event in manifest.events)
+        delete prototype.events[event]
+
   merge(manifest, { entity, events, extensions })
 }
 

package/src/.component/defaults.js

@@ -1,11 +1,13 @@
 'use strict'
 
 const { hash } = require('@toa.io/generic')
-const assert = require('node:assert')
 
 // these defaults are required before validation
-const defaults = (manifest) => {
-  if (manifest.name === undefined) manifest.name = protoName(manifest)
+const defaults = (manifest, proto) => {
+  if (manifest.name === undefined)
+    if (proto) manifest.name = protoName(manifest)
+    else nameAfterDir(manifest)
+
   if (manifest.bindings === undefined) manifest.bindings = ['@toa.io/bindings.amqp']
   if (manifest.bridge === undefined) manifest.bridge = '@toa.io/bridges.node'
 
@@ -24,4 +26,13 @@ function protoName (manifest) {
   return 'proto' + hash(manifest.path)
 }
 
+function nameAfterDir (manifest) {
+  const parts = manifest.path.split('/')
+  const dirname = parts[parts.length - 1]
+  const [name, namespace] = dirname.split('.').reverse()
+
+  manifest.name = name
+  manifest.namespace = namespace
+}
+
 exports.defaults = defaults

package/src/.component/dereference.js

@@ -25,7 +25,12 @@ const createResolver = (properties) => (property) => {
 function operations (manifest, resolver) {
   for (const operation of Object.values(manifest.operations)) {
     if (operation.input !== undefined) operation.input = schema(operation.input, resolver)
-    if (operation.output !== undefined) operation.output = schema(operation.output, resolver)
+
+    if (operation.output !== undefined)
+      if (Array.isArray(operation.output) && operation.output.length === 1)
+        operation.output = [schema(operation.output[0], resolver)]
+      else
+        operation.output = schema(operation.output, resolver)
   }
 
   // forwarding

package/src/.component/extensions.js

@@ -4,7 +4,10 @@ const { directory: { find } } = require('@toa.io/filesystem')
 const { resolve } = require('../shortcuts')
 
 const extensions = (manifest) => {
-  if (manifest.extensions === undefined) return
+  if (manifest.extensions === undefined)
+    manifest.extensions = PREDEFINED
+  else
+    manifest.extensions = Object.assign({}, PREDEFINED, manifest.extensions)
 
   const extensions = manifest.extensions
 
@@ -29,4 +32,8 @@ const extensions = (manifest) => {
   }
 }
 
+const PREDEFINED = {
+  '@toa.io/extensions.telemetry': null
+}
+
 exports.extensions = extensions

package/src/.component/merge.js

@@ -44,8 +44,13 @@ const define = async (root, manifest, property) => {
 
       const declared = manifest[property][endpoint]
 
-      if (declared === undefined) manifest[property][endpoint] = item
-      else merge(declared, item)
+      try {
+        if (declared === undefined) manifest[property][endpoint] = item
+        else merge(declared, item)
+      } catch (error) {
+        console.error(`Error merging ${singular} '${endpoint}' in ${root}`)
+        throw error
+      }
     }
   }
 }

package/src/.component/schema.yaml

@@ -38,15 +38,19 @@ properties:
     type: object
     properties:
       id:
-        $ref: 'definitions#/definitions/locator'
+        type: string
+        pattern: ^([a-zA-Z]+([_a-zA-Z0-9]*[a-zA-Z0-9]+)?)(\.([a-zA-Z]+([_a-zA-Z0-9]*[a-zA-Z0-9]+)?))$
       label:
-        $ref: 'definitions#/definitions/label'
+        type: string
+        pattern: ^([a-zA-Z]+([_a-zA-Z0-9]*[a-zA-Z0-9]+)?)(-([a-zA-Z]+([_a-zA-Z0-9]*[a-zA-Z0-9]+)?))*$
 
   name:
-    $ref: 'definitions#/definitions/token'
+    type: string
+    pattern: ^[a-zA-Z]([a-zA-Z0-9]{1,31})?$
 
   namespace:
-    $ref: 'definitions#/definitions/token'
+    type: string
+    pattern: ^[a-zA-Z]([a-zA-Z0-9]{1,31})?$
     default: 'default'
     not:
       oneOf:
@@ -60,6 +64,8 @@ properties:
     properties:
       image:
         type: string
+      run:
+        type: string
 
   entity:
     type: object
@@ -68,7 +74,7 @@ properties:
         type: string
         default: '@toa.io/storages.mongodb'
       schema:
-        $ref: 'definitions#/definitions/schema'
+        $ref: https://json-schema.org/draft/2019-09/schema
         type: object
         properties:
           type:
@@ -95,8 +101,8 @@ properties:
             patternProperties:
               '.*':
                 type: string
-                enum: [asc, desc, hash]
-      dependent:
+                enum: [asc, desc, hash, text]
+      associated:
         type: boolean
         default: false
       custom:
@@ -123,9 +129,9 @@ properties:
         type: object
         properties:
           type:
-            enum: [transition, observation, assignment, computation, effect]
+            enum: [transition, observation, assignment, computation, effect, unmanaged]
           scope:
-            enum: [object, objects, changeset, none]
+            enum: [object, objects, changeset, stream, none]
           concurrency:
             enum: [none, retry]
           forward:
@@ -135,9 +141,14 @@ properties:
           bindings:
             $ref: '#/properties/bindings'
           input:
-            $ref: 'definitions#/definitions/schema'
+            $ref: https://json-schema.org/draft/2019-09/schema
           output:
-            $ref: 'definitions#/definitions/schema'
+            $ref: https://json-schema.org/draft/2019-09/schema
+            default: { }
+          errors:
+            type: array
+            items:
+              type: string
           query:
             type: boolean
         required: [type, scope, bindings]
@@ -174,7 +185,7 @@ properties:
             then:
               properties:
                 scope:
-                  enum: [object, objects, none]
+                  enum: [object, objects, stream, none]
                 query:
                   not:
                     const: false
@@ -189,7 +200,7 @@ properties:
           - if: # computation
               properties:
                 type:
-                  const: computation
+                  enum: [computation, unmanaged]
             then:
               properties:
                 scope:
@@ -205,18 +216,15 @@ properties:
             then:
               properties:
                 scope:
-                  const: none
                   default: none
-                query:
-                  const: false
-                  default: false
+                  enum: [object, objects, stream, none]
         additionalProperties: false
     additionalProperties: false
 
   events:
     type: object
     propertyNames:
-      $ref: 'definitions#/definitions/name'
+      $ref: '#/definitions/name'
     patternProperties:
       '.*':
         type: object
@@ -243,13 +251,13 @@ properties:
         type: object
         properties:
           operation:
-            $ref: 'definitions#/definitions/name'
+            $ref: '#/definitions/name'
           bridge:
             type: string
           binding:
             type: string
           source:
-            $ref: 'definitions#/definitions/name'
+            $ref: '#/definitions/name'
             not:
               const: context
           path:
@@ -260,6 +268,8 @@ properties:
           adaptive:
             type: boolean
             default: false
+          arguments:
+            type: array
         required: [operation]
         additionalProperties: false
 

package/src/.component/validate.js

@@ -3,15 +3,15 @@
 const path = require('node:path')
 
 const { load } = require('@toa.io/yaml')
-const { Schema } = require('@toa.io/schema')
+const schemas = require('@toa.io/schemas')
 
 const object = load.sync(path.resolve(__dirname, 'schema.yaml'))
-const schema = new Schema(object)
+const schema = schemas.schema(object)
 
 const validate = (manifest) => {
   const error = schema.fit(manifest)
 
-  if (error) throw new Error(error.message)
+  if (error) throw error
 
   if (manifest.events !== undefined) events(manifest)
   if (manifest.receivers !== undefined) receivers(manifest)
@@ -32,11 +32,11 @@ const receivers = (manifest) => {
     }
 
     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(', ')}`)
+      throw new Error(`Receiver '${locator}' must refer to an operation of the allowed types: ${Array.from(TYPES).join(', ')}`)
     }
   }
 }
 
-const TYPES = new Set(['transition', 'effect'])
+const TYPES = new Set(['transition', 'effect', 'unmanaged'])
 
 exports.validate = validate

package/src/.context/.dependencies/resolve.js

@@ -24,6 +24,15 @@ const resolve = (references, annotations) => {
     }
   }
 
+  for (const dependency of Object.keys(annotations)) {
+    const { module } = load(dependency)
+
+    if (!module.standalone || (dependency in dependencies))
+      continue
+
+    dependencies[dependency] = []
+  }
+
   return dependencies
 }
 

package/src/.context/schema.yaml

@@ -6,7 +6,8 @@ properties:
   version:
     type: string
   name:
-    $ref: 'definitions#/definitions/label'
+    type: string
+    pattern: ^([a-zA-Z]+([_a-zA-Z0-9]*[a-zA-Z0-9]+)?)(-([a-zA-Z]+([_a-zA-Z0-9]*[a-zA-Z0-9]+)?))*$
   description:
     type: string
   packages:
@@ -46,7 +47,7 @@ properties:
           - linux/amd64
           - linux/arm/v7
           - linux/arm64
-    required: [base, platforms]
+    # required: [base]
   compositions:
     type: array
     minItems: 1
@@ -54,14 +55,16 @@ properties:
       type: object
       properties:
         name:
-          $ref: 'definitions#/definitions/token'
+          type: string
+          pattern: ^[a-zA-Z]([a-zA-Z0-9]{1,31})?$
         image:
           type: string
         components:
           type: array
           minItems: 1
           items:
-            $ref: 'definitions#/definitions/locator'
+            type: string
+            pattern: ^([a-zA-Z]+([_a-zA-Z0-9]*[a-zA-Z0-9]+)?)(\.([a-zA-Z]+([_a-zA-Z0-9]*[a-zA-Z0-9]+)?))$
       required: [name, components]
   annotations:
     type: object

package/src/.context/validate.js

@@ -3,15 +3,12 @@
 const { resolve } = require('node:path')
 
 const { load } = require('@toa.io/yaml')
-const { Schema } = require('@toa.io/schema')
+const schemas = require('@toa.io/schemas')
 
 const path = resolve(__dirname, 'schema.yaml')
 const object = load.sync(path)
-const schema = new Schema(object)
+const schema = schemas.schema(object)
 
-/**
- * @param {toa.norm.context.Declaration} context
- */
 const validate = (context) => {
   schema.validate(context)
 }

package/src/component.js

@@ -20,7 +20,7 @@ const {
 const component = async (path) => {
   const manifest = await load(path)
 
-  normalize(manifest)
+  normalize(manifest, path)
   validate(manifest)
   extensions(manifest)
 
@@ -29,21 +29,21 @@ const component = async (path) => {
   return manifest
 }
 
-const load = async (path, base) => {
+const load = async (path, base, proto = false) => {
   if (base !== undefined) path = find(path, base, MANIFEST)
 
   const file = join(path, MANIFEST)
-  const manifest = /** @type {toa.norm.Component} */ await yaml(file) ?? {}
+  const manifest = await yaml(file) ?? {}
 
   manifest.path = path
 
-  defaults(manifest)
+  defaults(manifest, proto)
   await expand(manifest)
 
   await merge(path, manifest)
 
   if (manifest.prototype !== null) {
-    const prototype = await load(manifest.prototype, path)
+    const prototype = await load(manifest.prototype, path, true)
 
     collapse(manifest, prototype)
   }

package/src/shortcuts.js

@@ -50,7 +50,9 @@ const SHORTCUTS = {
   configuration: '@toa.io/extensions.configuration',
   origins: '@toa.io/extensions.origins',
   stash: '@toa.io/extensions.stash',
-  storages: '@toa.io/extensions.storages'
+  storages: '@toa.io/extensions.storages',
+  telemetry: '@toa.io/extensions.telemetry',
+  mail: '@toa.io/extensions.mail'
 }
 
 exports.recognize = recognize

package/test/component/validate.test.js

@@ -1,5 +1,3 @@
-// noinspection JSUnresolvedVariable
-
 'use strict'
 
 const clone = require('clone-deep')
@@ -20,13 +18,13 @@ it('should be ok', () => {
 it('should provide error', () => {
   manifest.foo = 'bar'
 
-  expect(() => validate(manifest)).toThrow(/must NOT have additional property/)
+  expect(() => validate(manifest)).toThrow()
 })
 
 it('should not have additional properties', () => {
   manifest.foo = 'bar'
 
-  expect(() => validate(manifest)).toThrow(/must NOT have additional property/)
+  expect(() => validate(manifest)).toThrow()
 })
 
 describe('namespace', () => {
@@ -83,13 +81,13 @@ describe('entity', () => {
 
   it('should not have additional properties', () => {
     manifest.entity.foo = 'bar'
-    expect(() => validate(manifest)).toThrow(/must NOT have additional property/)
+    expect(() => validate(manifest)).toThrow()
   })
 
   describe('schema', () => {
     it('should be required', () => {
       delete manifest.entity.schema
-      expect(() => validate(manifest)).toThrow(/must have required property/)
+      expect(() => validate(manifest)).toThrow()
     })
 
     it('should be JSON schema object', () => {
@@ -99,7 +97,7 @@ describe('entity', () => {
 
     it('should be JSON schema object of type object', () => {
       manifest.entity.schema = { type: 'integer' }
-      expect(() => validate(manifest)).toThrow(/must be equal to constant 'object'/)
+      expect(() => validate(manifest)).toThrow(/must be equal to constant/)
 
       manifest.entity.schema = {}
       validate(manifest)
@@ -112,15 +110,18 @@ describe('entity', () => {
     })
 
     it('should allow default id', () => {
-      manifest.entity.schema.properties.id = { type: 'string', pattern: '^[a-fA-F0-9]+$' }
+      manifest.entity.schema.properties.id = {
+        type: 'string',
+        pattern: '^[a-fA-F0-9]+$'
+      }
       expect(() => validate(manifest)).not.toThrow()
     })
   })
 
-  describe('dependent', () => {
+  describe('associated', () => {
     it('should provide default', () => {
       expect(() => validate(manifest)).not.toThrow()
-      expect(manifest.entity.dependent).toBe(false)
+      expect(manifest.entity.associated).toBe(false)
     })
   })
 })
@@ -151,7 +152,7 @@ describe('operations', () => {
 
   it('should not have additional properties', () => {
     manifest.operations.get.foo = 'bar'
-    expect(() => validate(manifest)).toThrow(/additional property/)
+    expect(() => validate(manifest)).toThrow()
   })
 
   it('should have type (transition or observation)', () => {
@@ -173,8 +174,7 @@ describe('operations', () => {
   })
 
   it.each([
-    ['computation', 'compute'],
-    ['effect', 'affect']
+    ['computation', 'compute']
   ])('should set query: false for %s', async (_, operation) => {
     validate(manifest)
 
@@ -247,7 +247,7 @@ describe('receivers', () => {
   it('should throw if transition points to observation', () => {
     manifest.receivers['foo.bar.happened'].operation = 'get'
 
-    expect(() => validate(manifest)).toThrow(/one of the allowed types/)
+    expect(() => validate(manifest)).toThrow(/of the allowed types/)
   })
 
   it('should throw if source has a name `context`', async () => {

package/test/context/validate.test.js

@@ -45,12 +45,6 @@ describe('registry', () => {
     expect(() => validate(context)).toThrow(/required property 'registry'/)
   })
 
-  it('should require base', () => {
-    delete context.registry.base
-
-    expect(() => validate(context)).toThrow(/required property 'base'/)
-  })
-
   it('should set default platforms', () => {
     delete context.registry.platforms
 

package/types/component.d.ts

@@ -37,7 +37,7 @@ type Receiver = {
 type Entity = {
   schema: Object
   storage?: string
-  dependent?: boolean
+  associated?: boolean
 }
 
 type Declaration = {