bajo 0.2.4 → 0.2.6

package/boot/helper/import-module.js

@@ -1,6 +1,7 @@
 import resolvePath from './resolve-path.js'
 import { isFunction, isPlainObject } from 'lodash-es'
 import error from './error.js'
+import fs from 'fs-extra'
 
 async function load (file, asDefaultImport = true) {
   const imported = await import(resolvePath(file, true))
@@ -9,6 +10,7 @@ async function load (file, asDefaultImport = true) {
 }
 
 async function importModule (file, { asDefaultImport, asHandler } = {}) {
+  if (!fs.existsSync(file)) return
   let mod = await load(file, asDefaultImport)
   if (!asHandler) return mod
   if (isFunction(mod)) mod = { level: 999, handler: mod }

package/boot/lib/parse-args-argv.js

@@ -6,6 +6,7 @@ import dotenvParseVariables from 'dotenv-parse-variables'
 import importModule from '../helper/import-module.js'
 import { find, each, set, camelCase, forOwn } from 'lodash-es'
 import fs from 'fs-extra'
+import path from 'path'
 import currentLoc from '../helper/current-loc.js'
 
 const { unflatten } = flat
@@ -14,7 +15,7 @@ const parseItem = (data, delimiter) => {
   return unflatten(data, {
     delimiter,
     safe: true,
-    overwrite: true,
+    overwrite: true
   })
 }
 
@@ -28,10 +29,8 @@ const parseWithParser = async () => {
 
 const parseWithYargs = async () => {
   const parser = './app/bajo/argv-parser.js'
-  if (fs.existsSync(parser)) {
-    const mod = await importModule(parser)
-    return await mod(yargs)
-  }
+  const mod = await importModule(parser)
+  if (mod) return await mod(yargs)
   const pkg = fs.readJSONSync(`${currentLoc(import.meta).dir}/../../package.json`)
   let name = `node ${pkg.main}`
   if (pkg.bin) name = path.basename(pkg.bin, '.js')
@@ -47,7 +46,7 @@ const parseWithYargs = async () => {
     .version().alias('version', 'v')
     .help().alias('help', 'h')
     .alias('tool', 't')
-    if (pkg.homepage) cli.epilog(`For more information please visit ${pkg.homepage}`)
+  if (pkg.homepage) cli.epilog(`For more information please visit ${pkg.homepage}`)
   return cli.argv
 }
 

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

@@ -1,5 +1,4 @@
 import { isFunction, isPlainObject, map } from 'lodash-es'
-import fs from 'fs-extra'
 
 async function collectConfigHandlers (pkg) {
   const { getModuleDir, importModule, log } = this.bajo.helper
@@ -10,13 +9,11 @@ async function collectConfigHandlers (pkg) {
     } catch (err) {}
     if (!dir) continue
     const file = `${dir}/bajo/extend/read-config.js`
-    if (!fs.existsSync(file)) continue
-    try {
-      let mod = await importModule(file)
-      if (isFunction(mod)) mod = await mod.call(this)
-      if (isPlainObject(mod)) mod = [mod]
-      this.bajo.configHandlers.concat(mod)
-    } catch (err) {}
+    let mod = await importModule(file)
+    if (!mod) continue
+    if (isFunction(mod)) mod = await mod.call(this)
+    if (isPlainObject(mod)) mod = [mod]
+    this.bajo.configHandlers.concat(mod)
   }
   const exts = map(this.bajo.configHandlers, 'ext')
   log.trace('Config handlers: %s', exts.join(', '))

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

@@ -1,5 +1,4 @@
 import {} from 'lodash-es'
-import fs from 'fs-extra'
 
 async function collectExitHandlers () {
   const { importModule, log, eachPlugins, getConfig, print } = this.bajo.helper
@@ -9,13 +8,10 @@ async function collectExitHandlers () {
   const names = []
   await eachPlugins(async function ({ plugin, dir }) {
     const file = `${dir}/bajo/exit.js`
-    if (!fs.existsSync(file)) return undefined
-    try {
-      const mod = await importModule(file)
-      this.bajo.exitHandler[plugin] = mod
-      names.push(plugin)
-    } catch (err) {
-    }
+    const mod = await importModule(file)
+    if (!mod) return undefined
+    this.bajo.exitHandler[plugin] = mod
+    names.push(plugin)
   })
   log.trace('Exit handlers: %s', names.length === 0 ? print.__('none') : names.join(', '))
 }

package/boot/plugins/run.js

@@ -1,5 +1,4 @@
 import { get, camelCase, upperFirst, map } from 'lodash-es'
-import fs from 'fs-extra'
 
 async function run ({ singles }) {
   const { runHook, log, eachPlugins, importModule, freeze, getConfig, print } = this.bajo.helper
@@ -10,12 +9,12 @@ async function run ({ singles }) {
     await runHook(`bajo:${camelCase(`before ${f} all plugins`)}`)
     await eachPlugins(async function ({ plugin, dir }) {
       const file = `${dir}/bajo/${f}.js`
-      if (fs.existsSync(file)) {
+      const mod = await importModule(file)
+      if (mod) {
         log.debug('%s: %s', print.__(upperFirst(f)), plugin)
         await runHook(`bajo:${camelCase(`before ${f} ${plugin}`)}`)
-        const item = await importModule(file)
         const params = f === 'start' ? ['all', true] : []
-        await item.call(this, ...params)
+        await mod.call(this, ...params)
         await runHook(`bajo:${camelCase(`after ${f} ${plugin}`)}`)
       }
       if (f === 'init') freeze(this[plugin].config)

package/package.json

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