@toa.io/norm 1.0.0-alpha.30 → 1.0.0-alpha.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/norm",
-  "version": "1.0.0-alpha.30",
+  "version": "1.0.0-alpha.32",
   "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.30",
-    "@toa.io/generic": "1.0.0-alpha.30",
-    "@toa.io/schema": "1.0.0-alpha.30",
-    "@toa.io/schemas": "1.0.0-alpha.30",
-    "@toa.io/yaml": "1.0.0-alpha.30"
+    "@toa.io/core": "1.0.0-alpha.32",
+    "@toa.io/generic": "1.0.0-alpha.32",
+    "@toa.io/schema": "1.0.0-alpha.32",
+    "@toa.io/schemas": "1.0.0-alpha.32",
+    "@toa.io/yaml": "1.0.0-alpha.32"
   },
-  "gitHead": "29cc19358f35fbe9229dced979724f7a26538013"
+  "gitHead": "93ceb53797363abb77eb9c550db77e906691d42a"
 }

package/src/.component/defaults.js

@@ -4,8 +4,11 @@ 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 +27,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/schema.yaml

@@ -260,6 +260,8 @@ properties:
           adaptive:
             type: boolean
             default: false
+          arguments:
+            type: array
         required: [operation]
         additionalProperties: false
 

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,7 +29,7 @@ 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)
@@ -37,13 +37,13 @@ const load = async (path, base) => {
 
   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)
   }