bajo 0.3.3 → 0.3.4

package/boot/helper/import-module.js

@@ -1,9 +1,9 @@
 import resolvePath from './resolve-path.js'
-import { isFunction, isPlainObject } from 'lodash-es'
+import { isFunction, isPlainObject, get } from 'lodash-es'
 import error from './error.js'
 import fs from 'fs-extra'
 
-async function load (file, asDefaultImport = true, noCache = false) {
+async function load (file, asDefaultImport = true, noCache = true) {
   file = resolvePath(file, true)
   if (noCache) file += `?_=${Date.now()}`
   const imported = await import(file)
@@ -12,6 +12,13 @@ async function load (file, asDefaultImport = true, noCache = false) {
 }
 
 async function importModule (file, { asDefaultImport, asHandler, noCache } = {}) {
+  if (file.includes(':')) {
+    const [plugin, path] = file.split(':')
+    if (plugin.length > 1) {
+      const dir = get(this[plugin], 'config.dir.pkg')
+      file = `${dir}${path}`
+    }
+  }
   if (!fs.existsSync(file)) return
   let mod = await load(file, asDefaultImport, noCache)
   if (!asHandler) return mod

package/boot/helper/start-plugin.js

@@ -1,7 +1,6 @@
 async function startPlugin (name, ...args) {
-  const { getConfig, importModule } = this.bajo.helper
-  const cfg = getConfig(name, { full: true })
-  const start = await importModule(`${cfg.dir.pkg}/bajo/start.js`)
+  const { importModule } = this.bajo.helper
+  const start = await importModule(`${name}:/bajo/start.js`)
   await start.call(this, ...args)
 }
 

package/boot/plugins/collect-exit-handlers.js

@@ -7,8 +7,7 @@ async function collectExitHandlers () {
   this.bajo.exitHandler = this.bajo.exitHandler ?? {}
   const names = []
   await eachPlugins(async function ({ plugin, dir }) {
-    const file = `${dir}/bajo/exit.js`
-    const mod = await importModule(file)
+    const mod = await importModule(`${dir}/bajo/exit.js`)
     if (!mod) return undefined
     this.bajo.exitHandler[plugin] = mod
     names.push(plugin)

package/boot/plugins/run.js

@@ -8,8 +8,7 @@ async function run () {
   for (const f of methods) {
     await runHook(`bajo:${camelCase(`before ${f} all plugins`)}`)
     await eachPlugins(async function ({ plugin, dir }) {
-      const file = `${dir}/bajo/${f}.js`
-      const mod = await importModule(file)
+      const mod = await importModule(`${dir}/bajo/${f}.js`)
       if (mod) {
         log.debug('%s: %s', print.__(upperFirst(f)), plugin)
         await runHook(`bajo:${camelCase(`before ${f} ${plugin}`)}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {