@toa.io/boot 0.7.0-dev.2 → 0.7.1-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/boot",
-  "version": "0.7.0-dev.2",
+  "version": "0.7.1-dev.0",
   "description": "Toa Boot",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,12 +19,12 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/core": "0.7.0-dev.2",
-    "@toa.io/filesystem": "0.7.0-dev.2",
-    "@toa.io/generic": "0.7.0-dev.2",
-    "@toa.io/norm": "0.7.0-dev.2",
-    "@toa.io/schema": "0.7.0-dev.2",
+    "@toa.io/core": "0.7.0",
+    "@toa.io/filesystem": "0.7.0",
+    "@toa.io/generic": "0.7.0",
+    "@toa.io/norm": "0.7.1-dev.0",
+    "@toa.io/schema": "0.7.0",
     "clone-deep": "4.0.1"
   },
-  "gitHead": "f6267f46f0de28c834b2b7290338c32e6bc56e4d"
+  "gitHead": "7c52ddaad46512d8a8d913982d7330f83adcc98b"
 }

package/src/component.js

@@ -11,9 +11,8 @@ const boot = require('./index')
  * @returns {Promise<toa.core.Component>}
  */
 const component = async (manifest) => {
-  const name = manifest.entity.storage
   const locator = new Locator(manifest.name, manifest.namespace)
-  const storage = boot.storage(locator, name, manifest.properties?.[name])
+  const storage = boot.storage(manifest)
   const context = await boot.context(manifest)
   const emission = boot.emission(manifest.events, locator)
   const schema = new Schema(manifest.entity.schema)

package/src/storage.js

@@ -1,21 +1,43 @@
 'use strict'
 
+const { join } = require('node:path')
 const extensions = require('./extensions')
 
 /**
- * @param {toa.core.Locator} locator
- * @param {string} provider
- * @param {any} properties
+ * @param {toa.norm.Component} component
  * @returns {toa.core.Storage}
  */
-const storage = (locator, provider, properties) => {
-  const { Factory } = require(provider)
+const storage = (component) => {
+  const [Factory, properties] = load(component)
 
   /** @type {toa.core.storages.Factory} */
   const factory = new Factory()
-  const storage = factory.storage(locator, properties)
+  const storage = factory.storage(component.locator, properties)
 
   return extensions.storage(storage)
 }
 
+function load (component) {
+  const reference = component.entity.storage
+  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
+  }
+}
+
 exports.storage = storage