bajo 0.3.3 → 0.3.5

package/boot/helper/get-plugin-file.js

@@ -0,0 +1,14 @@
+import { get } from 'lodash-es'
+
+function getPluginFile (file) {
+  if (file.includes(':')) {
+    const [plugin, path] = file.split(':')
+    if (plugin !== 'file' && this && this[plugin] && plugin.length > 1) {
+      const dir = get(this[plugin], 'config.dir.pkg')
+      file = `${dir}${path}`
+    }
+  }
+  return file
+}
+
+export default getPluginFile

package/boot/helper/import-module.js

@@ -1,9 +1,10 @@
 import resolvePath from './resolve-path.js'
+import getPluginFile from './get-plugin-file.js'
 import { isFunction, isPlainObject } 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 +13,7 @@ async function load (file, asDefaultImport = true, noCache = false) {
 }
 
 async function importModule (file, { asDefaultImport, asHandler, noCache } = {}) {
+  file = getPluginFile.call(this, file)
   if (!fs.existsSync(file)) return
   let mod = await load(file, asDefaultImport, noCache)
   if (!asHandler) return mod

package/boot/helper/import-pkg.js

@@ -1,4 +1,4 @@
-import { isPlainObject, map, last, isEmpty, has, keys, values, trim, get } from 'lodash-es'
+import { isPlainObject, last, isEmpty, has, keys, values, get } from 'lodash-es'
 import os from 'os'
 import getModuleDir from './get-module-dir.js'
 import resolvePath from './resolve-path.js'
@@ -7,46 +7,21 @@ import defaultsDeep from './defaults-deep.js'
 import path from 'path'
 import fs from 'fs-extra'
 
-/**
- * Load/import a package dynamically. You can import package one-by-one or multiple
- * packages at once.
- *
- * Package 'pkg' must be in the following format: ```<original name>:<new name>:<bajo package name>```
- * ```<new name>``` can be omitted, so the format will be: ```<name>::<bajo package name>```
- *
- * If you only import one package, returned value is the imported package itself
- * If multiple packages are imported, returned value is an object with ```<new name>``` as its
- * keys and imported packages as its values
- *
- * Example:
- * ```
- * const imported = await importPkg('ora::bajo-cli')
- * const multiple = await importPkg('ora::bajo-cli', 'lodash:_:bajo')
- *
- * @param  {...string} pkg
- * @returns
- */
-
-async function importPkg (...pkg) {
+async function importPkg (...pkgs) {
   const result = {}
   let opts = { returnDefault: true, thrownNotFound: false, noCache: false }
-  if (isPlainObject(last(pkg))) {
-    opts = defaultsDeep(pkg.pop(), opts)
+  if (isPlainObject(last(pkgs))) {
+    opts = defaultsDeep(pkgs.pop(), opts)
   }
-  for (const p of pkg) {
-    const parts = map(p.split(':'), i => trim(i))
-    let [ns, orgName, name] = parts
-    if (parts.length === 1) {
-      orgName = ns
-      ns = 'bajo'
-      name = orgName
-    } else if (parts.length === 2) {
-      name = orgName
+  for (const pkg of pkgs) {
+    let [plugin, name] = pkg.split(':').map(item => item.trim())
+    if (!name) {
+      name = plugin
+      plugin = 'bajo'
     }
-    if (isEmpty(name)) name = orgName
-    const dir = getModuleDir.call(this, orgName, ns)
-    const pkg = readJson(`${dir}/package.json`, opts.thrownNotFound)
-    const mainFileOrg = dir + '/' + (pkg.main ?? get(pkg, 'exports.default', 'index.js'))
+    const dir = getModuleDir.call(this, name, plugin)
+    const p = readJson(`${dir}/package.json`, opts.thrownNotFound)
+    const mainFileOrg = dir + '/' + (p.main ?? get(p, 'exports.default', 'index.js'))
     let mainFile = resolvePath(mainFileOrg, os.platform() === 'win32')
     if (isEmpty(path.extname(mainFile))) {
       if (fs.existsSync(`${mainFileOrg}/index.js`)) mainFile += '/index.js'
@@ -60,7 +35,7 @@ async function importPkg (...pkg) {
     }
     result[name] = mod
   }
-  if (pkg.length === 1) return result[keys(result)[0]]
+  if (pkgs.length === 1) return result[keys(result)[0]]
   if (opts.asObject) return result
   return values(result)
 }

package/boot/helper/read-config.js

@@ -1,5 +1,6 @@
 import path from 'path'
 import resolvePath from './resolve-path.js'
+import getPluginFile from './get-plugin-file.js'
 import readJson from './read-json.js'
 import parseObject from './parse-object.js'
 import { find, map, isEmpty } from 'lodash-es'
@@ -7,7 +8,7 @@ import error from './error.js'
 import fg from 'fast-glob'
 
 async function readConfig (file, { pattern, globOptions = {}, ignoreError, defValue = {} } = {}) {
-  file = resolvePath(file)
+  file = resolvePath(getPluginFile.call(this, file))
   let ext = path.extname(file)
   const fname = path.dirname(file) + '/' + path.basename(file, ext)
   ext = ext.toLowerCase()

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.5",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {