@toa.io/boot 1.0.0-alpha.7 → 1.0.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/boot",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "description": "Toa Boot",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -20,13 +20,13 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "1.0.0-alpha.7",
-    "@toa.io/filesystem": "1.0.0-alpha.7",
-    "@toa.io/generic": "1.0.0-alpha.7",
-    "@toa.io/norm": "1.0.0-alpha.7",
-    "@toa.io/schema": "1.0.0-alpha.7",
+    "@toa.io/core": "1.0.0-alpha.8",
+    "@toa.io/filesystem": "1.0.0-alpha.8",
+    "@toa.io/generic": "1.0.0-alpha.8",
+    "@toa.io/norm": "1.0.0-alpha.8",
+    "@toa.io/schema": "1.0.0-alpha.8",
     "clone-deep": "4.0.1",
     "dotenv": "16.1.1"
   },
-  "gitHead": "4f5ac0bc342d4b7bd469fbe5c74266f050b55c9f"
+  "gitHead": "2ee18835c8214600e1d354251fa632913bff38c3"
 }

package/src/manifest.js

@@ -14,28 +14,34 @@ const manifest = async (path, options = {}) => {
   const manifest = await load(path)
 
   if (options?.bindings !== undefined) {
-    if ('operations' in manifest)
-      for (const operation of Object.values(manifest.operations))
+    if ('operations' in manifest) {
+      for (const operation of Object.values(manifest.operations)) {
         operation.bindings = options.bindings
+      }
+    }
 
     const check = (binding) => require(binding).properties?.async === true
     const asyncBinding = options.bindings.find(check)
 
     if (asyncBinding === undefined) throw new Error('Bindings override must contain at least one async binding')
 
-    if ('events' in manifest)
+    if ('events' in manifest) {
       for (const event of Object.values(manifest.events)) event.binding = asyncBinding
+    }
 
-    if ('receivers' in manifest)
-      for (const receiver of Object.values(manifest.receivers))
+    if ('receivers' in manifest) {
+      for (const receiver of Object.values(manifest.receivers)) {
         if (receiver.source === undefined) receiver.binding = asyncBinding
+      }
+    }
   }
 
   if (manifest.extensions === undefined) manifest.extensions = {}
 
-  // add `null` manifests
-  for (const extension of options.extensions) {
-    if (!(extension in manifest.extensions)) manifest.extensions[extension] = null
+  if (options.extensions !== undefined) {
+    for (const extension of options.extensions) {
+      if (!(extension in manifest.extensions)) manifest.extensions[extension] = null
+    }
   }
 
   if ('storage' in options && 'entity' in manifest) manifest.entity.storage = options.storage
@@ -45,8 +51,6 @@ const manifest = async (path, options = {}) => {
   return manifest
 }
 
-const DEFAULTS = {
-  extensions: ['@toa.io/extensions.sampling']
-}
+const DEFAULTS = {}
 
 exports.manifest = manifest

package/src/storage.js

@@ -6,11 +6,11 @@ const extensions = require('./extensions')
 const storage = (manifest) => {
   if (manifest.entity === undefined) return
 
-  const [Factory, properties] = load(manifest)
+  const Factory = load(manifest)
 
   /** @type {toa.core.storages.Factory} */
   const factory = new Factory()
-  const storage = factory.storage(manifest.locator, properties)
+  const storage = factory.storage(manifest.locator, manifest.entity)
 
   return extensions.storage(storage)
 }
@@ -20,22 +20,7 @@ function load (component) {
   const path = require.resolve(reference, { paths: [component.path, __dirname] })
   const { Factory } = require(path)
 
-  const pkg = loadPackageJson(component.path, reference)
-  const properties = pkg === null ? null : component.properties?.[pkg.name]
-
-  return [Factory, properties]
-}
-
-function loadPackageJson (root, reference) {
-  const packageJson = join(reference, 'package.json')
-
-  try {
-    const path = require.resolve(packageJson, { paths: [root, __dirname] })
-
-    return require(path)
-  } catch (e) {
-    return null
-  }
+  return Factory
 }
 
 exports.storage = storage