@toa.io/norm 1.0.0-alpha.2 → 1.0.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.4",
   "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": "1.0.0-alpha.2",
-    "@toa.io/generic": "1.0.0-alpha.2",
-    "@toa.io/schema": "1.0.0-alpha.2",
-    "@toa.io/schemas": "1.0.0-alpha.2",
-    "@toa.io/yaml": "1.0.0-alpha.2"
+    "@toa.io/core": "1.0.0-alpha.4",
+    "@toa.io/generic": "1.0.0-alpha.4",
+    "@toa.io/schema": "1.0.0-alpha.4",
+    "@toa.io/schemas": "1.0.0-alpha.4",
+    "@toa.io/yaml": "1.0.0-alpha.4"
   },
-  "gitHead": "7688e6e980a65c82ac2e459be4e355eebf406cd0"
+  "gitHead": "80a91c0d9c167484247a91e69a0c0a3c344f90d0"
 }

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

@@ -7,6 +7,7 @@ const { extensions } = require('./extensions')
 const { operations } = require('./operations')
 const { properties } = require('./properties')
 const { receivers } = require('./receivers')
+const { version } = require('./version')
 
 exports.bridge = bridge
 exports.entity = entity
@@ -15,3 +16,4 @@ exports.extensions = extensions
 exports.operations = operations
 exports.properties = properties
 exports.receivers = receivers
+exports.version = version

package/src/.component/.expand/version.js

@@ -0,0 +1,19 @@
+'use strict'
+
+function version (manifest) {
+  if (manifest.version === undefined) {
+    const bridge = require(manifest.bridge)
+
+    if ('version' in bridge)
+      manifest.version = bridge.version(manifest)
+  }
+
+  if (manifest.version === undefined) {
+    console.warn(`Component '${manifest.namespace ? manifest.namespace + '.' : ''}${manifest.name}' has no version`)
+
+    manifest.version = Math.random().toString(36).slice(2)
+  }
+
+}
+
+exports.version = version

package/src/.component/defaults.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { hash } = require('@toa.io/generic')
+const assert = require('node:assert')
 
 // these defaults are required before validation
 const defaults = (manifest) => {
@@ -17,9 +18,6 @@ const defaults = (manifest) => {
   }
 
   if (manifest.prototype === undefined) manifest.prototype = '@toa.io/prototype'
-
-  // TODO: bridge.version()
-  if (manifest.version === undefined) manifest.version = '0.0.0'
 }
 
 function protoName (manifest) {

package/src/.component/expand.js

@@ -7,7 +7,8 @@ const {
   events,
   receivers,
   extensions,
-  properties
+  properties,
+  version
 } = require('./.expand')
 
 const expand = (manifest) => {
@@ -18,6 +19,7 @@ const expand = (manifest) => {
   receivers(manifest)
   properties(manifest)
   extensions(manifest)
+  version(manifest)
 }
 
 exports.expand = expand

package/src/.component/schema.yaml

@@ -53,7 +53,7 @@ properties:
         - const: 'system'
 
   version:
-    $ref: 'definitions#/definitions/version'
+    type: string
 
   build:
     type: object

package/src/.context/.dependencies/connectors.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { resolve } = require('node:path')
+
 const connectors = (context, extracted) => {
   const connectors = {}
 
@@ -10,11 +12,14 @@ const connectors = (context, extracted) => {
 
   for (const component of components) {
     if (component.entity !== undefined) {
-      if (connectors[component.entity.storage] === undefined) {
-        connectors[component.entity.storage] = []
+      let storage = component.entity.storage
+
+      if (storage[0] === '.') {
+        storage = resolve(component.path, storage)
       }
 
-      connectors[component.entity.storage].push(component)
+      connectors[storage] ??= []
+      connectors[storage].push(component)
     }
 
     const bindings = new Set()

package/src/.context/schema.yaml

@@ -4,7 +4,7 @@ $id: https://schemas.toa.io/0.0.0/context
 type: object
 properties:
   version:
-    $ref: 'definitions#/definitions/version'
+    type: string
   name:
     $ref: 'definitions#/definitions/label'
   description:
@@ -20,7 +20,7 @@ properties:
     type: object
     properties:
       version:
-        $ref: 'definitions#/definitions/version'
+        type: string
       registry:
         type: string
         format: uri

package/src/component.js

@@ -13,7 +13,6 @@ const {
   collapse,
   dereference,
   defaults,
-  dependencies,
   normalize,
   extensions
 } = require('./.component')

package/test/component/expand.fixtures.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const source = {
+  path: '',
   entity: {
     schema: {
       properties: {

package/test/context/validate.test.js

@@ -21,14 +21,6 @@ describe('runtime', () => {
     expect(() => validate(context)).toThrow(/required/)
   })
 
-  it('should require version as semver', () => {
-    delete context.runtime.version
-    expect(() => validate(context)).toThrow(/required/)
-
-    context.runtime.version = '.'
-    expect(() => validate(context)).toThrow(/pattern/)
-  })
-
   it('should require registry to match uri format', () => {
     context.runtime.registry = 'not-a-uri'
     expect(() => validate(context)).toThrow(/must match format/)