bajo 0.2.0 → 0.2.1

package/boot/exit-handler.js

@@ -4,7 +4,9 @@ async function exit (signal) {
   await eachPlugins(async function ({ plugin }) {
     const handler = this.bajo.exitHandler[plugin]
     if (!handler) return undefined
-    await handler.call(this)
+    try {
+      await handler.call(this)
+    } catch (err) {}
     log.debug('Exited: %s', plugin)
   })
   log.debug('Program shutdown')

package/boot/helper/get-module-dir.js

@@ -1,22 +1,34 @@
 import path from 'path'
+import fs from 'fs-extra'
+import getGlobalModuleDir from './get-global-module-dir.js'
 import resolvePath from './resolve-path.js'
 import { createRequire } from 'module'
 const require = createRequire(import.meta.url)
 
+const findDeep = (item, paths) => {
+  let dir
+  for (const p of paths) {
+    const d = `${p}/${item}`
+    if (fs.existsSync(d)) {
+      dir = d
+      break
+    }
+  }
+  return dir
+}
+
 const getModuleDir = (pkgName, base) => {
+  if (pkgName === 'app') return resolvePath(process.env.BAJOCWD)
   if (base === 'app') base = process.env.BAJOCWD
-  let pkgPath = pkgName + '/package.json'
-  if (base) pkgPath = `${base}/node_modules/${pkgPath}`
+  const pkgPath = pkgName + '/package.json'
   const paths = require.resolve.paths(pkgPath)
-  paths.unshift(path.join(process.env.BAJOCWD, 'node_modules', pkgName))
-  let resolved
-  try {
-    resolved = require.resolve(pkgPath, { paths })
-  } catch (err) {
-    return null
-  }
-  const dir = resolvePath(path.dirname(resolved))
-  return dir
+  const gdir = getGlobalModuleDir()
+  paths.unshift(gdir)
+  paths.unshift(resolvePath(path.join(process.env.BAJOCWD, 'node_modules')))
+  let dir = findDeep(pkgPath, paths)
+  if (base && !dir) dir = findDeep(`${base}/node_modules/${pkgPath}`, paths)
+  if (!dir) return null
+  return resolvePath(path.dirname(dir))
 }
 
 export default getModuleDir

package/boot/helper/get-module-dir.js__

@@ -0,0 +1,50 @@
+import getGlobalModuleDir from './get-global-module-dir.js'
+import resolvePath from './resolve-path.js'
+import { createRequire } from 'module'
+const require = createRequire(import.meta.url)
+
+function getDir (name, ns) {
+  const checker = '/package.json'
+  name = name + checker
+  let dir
+  let c = 0
+  try {
+    dir = require.resolve(resolvePath(name))
+    c = 1
+  } catch (err) {
+    try {
+      dir = require.resolve(name)
+      c = 2
+    } catch (err) {
+      try {
+        dir = require.resolve(process.cwd() + '/node_modules/' + name)
+        c = 3
+      } catch (err) {
+        try {
+          dir = getGlobalModuleDir(name, false)
+          c = 4
+        } catch (err) {
+          if (ns) {
+            const d = getGlobalModuleDir(null)
+            dir = require.resolve(`${d}/${ns}/node_modules/${name}`)
+            c = 5
+          }
+        }
+      }
+    }
+  }
+  if (!dir) return
+  return dir.slice(0, dir.length - checker.length)
+}
+
+const getModuleDir = (pkgName, ns) => {
+  let dir
+  if (pkgName === 'app') {
+    dir = process.env.BAJOCWD
+  } else {
+    dir = getDir(pkgName, ns)
+  }
+  return dir
+}
+
+export default getModuleDir

package/package.json

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