@toa.io/norm 0.24.0-alpha.17 → 0.24.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "0.24.0-alpha.17",
+  "version": "0.24.0-alpha.19",
   "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.24.0-alpha.17",
-    "@toa.io/generic": "0.24.0-alpha.17",
-    "@toa.io/schema": "0.24.0-alpha.17",
-    "@toa.io/schemas": "0.24.0-alpha.17",
-    "@toa.io/yaml": "0.24.0-alpha.17"
+    "@toa.io/core": "0.24.0-alpha.19",
+    "@toa.io/generic": "0.24.0-alpha.19",
+    "@toa.io/schema": "0.24.0-alpha.19",
+    "@toa.io/schemas": "0.24.0-alpha.19",
+    "@toa.io/yaml": "0.24.0-alpha.19"
   },
-  "gitHead": "6eddd2ce5172a38c0ae9c41017f23a28398cf839"
+  "gitHead": "5e251e2f9ec49448c0a038d7aa07b01ba2b8d065"
 }

package/src/.component/.expand/entity.js

@@ -5,7 +5,7 @@ const { expand } = require('@toa.io/schemas')
 const { resolve } = require('../../shortcuts')
 
 function entity (manifest) {
-  if (manifest.entity === undefined) return
+  if (!('entity' in manifest)) return
   if ('schema' in manifest.entity) manifest.entity.schema = expand(manifest.entity.schema)
 
   manifest.entity.storage = resolve(manifest.entity.storage)

package/src/.component/collapse.js

@@ -34,10 +34,14 @@ const collapse = (manifest, prototype) => {
     }
   }
 
-  delete prototype.entity?.storage // ???
-
   const { entity, events, extensions } = prototype
 
+  if (manifest.entity?.schema.properties.id !== undefined && entity.schema?.properties.id !== undefined) {
+    manifest.entity.custom = true
+
+    delete prototype.entity.schema.properties.id
+  }
+
   merge(manifest, { entity, events, extensions })
 }
 

package/src/.component/defaults.js

@@ -8,9 +8,13 @@ const defaults = (manifest) => {
   if (manifest.name === undefined) manifest.name = protoName(manifest)
   if (manifest.bindings === undefined) manifest.bindings = ['@toa.io/bindings.amqp']
   if (manifest.bridge === undefined) manifest.bridge = '@toa.io/bridges.node'
-  if (manifest.entity === null || manifest.entity === undefined) manifest.entity = { storage: null }
-  if (manifest.entity.storage === undefined) manifest.entity.storage = '@toa.io/storages.mongodb'
-  if (manifest.entity.storage === null) manifest.entity.storage = '@toa.io/storages.null'
+
+  if ('entity' in manifest) {
+    if (manifest.entity.storage === null) manifest.entity.storage = '@toa.io/storages.null'
+
+    // moved to schema
+    // if (manifest.entity.storage === undefined) manifest.entity.storage = '@toa.io/storages.mongodb'
+  }
 
   // TODO: bridge.version()
   if (manifest.version === undefined) manifest.version = '0.0.0'

package/src/.component/dereference.js

@@ -4,13 +4,28 @@ const { merge } = require('@toa.io/generic')
 
 const dereference = (manifest) => {
   // schemas
-  const property = resolve(manifest.entity.schema.properties)
+  const resolver = createResolver(manifest.entity?.schema?.properties)
 
-  schema(manifest.entity.schema, property)
+  if (manifest.entity !== undefined)
+    schema(manifest.entity.schema, resolver)
 
+  if ('operations' in manifest)
+    operations(manifest, resolver)
+
+}
+
+const createResolver = (properties) => (property) => {
+  if (properties?.[property] === undefined) {
+    throw new Error(`Referenced property '${property}' is not defined`)
+  }
+
+  return properties[property]
+}
+
+function operations (manifest, resolver) {
   for (const operation of Object.values(manifest.operations)) {
-    if (operation.input !== undefined) operation.input = schema(operation.input, property)
-    if (operation.output !== undefined) operation.output = schema(operation.output, property)
+    if (operation.input !== undefined) operation.input = schema(operation.input, resolver)
+    if (operation.output !== undefined) operation.output = schema(operation.output, resolver)
   }
 
   // forwarding
@@ -21,14 +36,7 @@ const dereference = (manifest) => {
   for (const operation of Object.values(manifest.operations)) {
     delete operation.forwarded
   }
-}
-
-const resolve = (schema) => (property) => {
-  if (schema[property] === undefined) {
-    throw new Error(`Referenced property '${property}' is not defined`)
-  }
 
-  return schema[property]
 }
 
 const schema = (object, resolve) => {

package/src/.component/schema.yaml

@@ -2,6 +2,9 @@ $schema: https://json-schema.org/draft/2019-09/schema
 $id: https://schemas.toa.io/0.0.0/manifest
 
 definitions:
+  name:
+    type: string
+    pattern: ^[a-zA-Z]+([_a-zA-Z0-9]*[a-zA-Z0-9]+)?$
   binding:
     type: string
     not:
@@ -20,7 +23,7 @@ properties:
       operations:
         type: object
         propertyNames:
-          $ref: 'definitions#/definitions/name'
+          $ref: '#/definitions/name'
         patternProperties:
           '.*':
             type: object
@@ -63,6 +66,7 @@ properties:
     properties:
       storage:
         type: string
+        default: '@toa.io/storages.mongodb'
       schema:
         $ref: 'definitions#/definitions/schema'
         type: object
@@ -74,9 +78,12 @@ properties:
             type: object
             propertyNames:
               oneOf:
-                - $ref: 'definitions#/definitions/name'
+                - $ref: '#/definitions/name'
                 - enum: [_version]
-      initialized:
+      dependent:
+        type: boolean
+        default: false
+      custom:
         type: boolean
         default: false
     required: [schema]
@@ -94,7 +101,7 @@ properties:
   operations:
     type: object
     propertyNames:
-      $ref: 'definitions#/definitions/name'
+      $ref: '#/definitions/name'
     patternProperties:
       '.*':
         type: object
@@ -106,7 +113,7 @@ properties:
           concurrency:
             enum: [none, retry]
           forward:
-            $ref: 'definitions#/definitions/name'
+            $ref: '#/definitions/name'
           bridge:
             type: string
           bindings:

package/src/component.js

@@ -50,7 +50,7 @@ const load = async (path, base) => {
   }
 
   dereference(manifest)
-  dependencies(manifest)
+  // dependencies(manifest)
 
   return manifest
 }

package/test/component/collapse.test.js

@@ -30,19 +30,6 @@ it('should remove prototype property', () => {
 })
 
 describe('entity', () => {
-  it('should ignore storage', () => {
-    const source = { entity: { storage: 'foo' } }
-    const prototype = { entity: { storage: 'bar' } }
-    const manifest = clone(source)
-
-    collapse(manifest, prototype)
-    expect(manifest).toStrictEqual(source)
-
-    delete manifest.entity.storage
-    collapse(manifest, prototype)
-    expect(manifest).toStrictEqual({ entity: {} })
-  })
-
   it('should merge entity schema', () => {
     const manifest = clone(samples.entity.manifest)
 

package/test/component/validate.test.js

@@ -117,10 +117,10 @@ describe('entity', () => {
     })
   })
 
-  describe('initialized', () => {
+  describe('dependent', () => {
     it('should provide default', () => {
       expect(() => validate(manifest)).not.toThrow()
-      expect(manifest.entity.initialized).toBe(false)
+      expect(manifest.entity.dependent).toBe(false)
     })
   })
 })

package/test/context/dereference.fixtures.js

@@ -18,8 +18,7 @@ const component = (id) => {
       name,
       id,
       label: `${namespace}-${name}`
-    },
-    entity: null
+    }
   }
 }
 

package/types/component.d.ts

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