bajo 0.2.1 → 0.2.2

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

@@ -1,11 +1,12 @@
 import path from 'path'
 import fs from 'fs-extra'
+import { get } from 'lodash-es'
 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) => {
+function findDeep (item, paths) {
   let dir
   for (const p of paths) {
     const d = `${p}/${item}`
@@ -17,9 +18,10 @@ const findDeep = (item, paths) => {
   return dir
 }
 
-const getModuleDir = (pkgName, base) => {
+function getModuleDir (pkgName, base) {
   if (pkgName === 'app') return resolvePath(process.env.BAJOCWD)
   if (base === 'app') base = process.env.BAJOCWD
+  else if (this && this[base]) base = get(this[base], 'config.pkg.name')
   const pkgPath = pkgName + '/package.json'
   const paths = require.resolve.paths(pkgPath)
   const gdir = getGlobalModuleDir()

package/package.json

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

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

@@ -1,50 +0,0 @@
-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