bajo 1.2.2 → 1.2.4

package/boot/class/bajo-core.js

@@ -23,7 +23,7 @@ import { types as formatTypes, formats } from '../lib/formats.js'
 const require = createRequire(import.meta.url)
 
 const {
-  isFunction, map,
+  isFunction, map, isObject,
   trim, filter, isEmpty, orderBy, pullAt, find, camelCase, isNumber,
   cloneDeep, isPlainObject, isArray, isString, set, omit, keys, indexOf,
   last, get, has, values, dropRight, pick
@@ -88,6 +88,12 @@ class BajoCore extends Plugin {
     return { ns, subNs, path: _path, fullNs: names.join('.'), type }
   }
 
+  buildNsPath = ({ ns = '', subNs, subSubNs, path } = {}) => {
+    if (subNs) ns += '.' + subNs
+    if (subSubNs) ns += '.' + subSubNs
+    return `${ns}:${path}`
+  }
+
   breakNsPath = (item = '', defaultNs = 'bajo', checkNs = true) => {
     let [ns, ...path] = item.split(':')
     const fullNs = ns
@@ -483,20 +489,28 @@ class BajoCore extends Plugin {
     return indexOf(levels, level) >= logLevel
   }
 
-  isValidApp = (dir) => {
+  isValidAppPlugin = (file, type, returnPkg) => {
+    if (isObject(file)) return get(file, 'bajo.type') === type
+    file = resolvePath(file)
+    if (path.basename(file) !== 'package.json') file += '/package.json'
+    try {
+      const pkg = fs.readJsonSync(file)
+      const valid = get(pkg, 'bajo.type') === type
+      if (valid) return returnPkg ? pkg : valid
+      return false
+    } catch (err) {
+      return false
+    }
+  }
+
+  isValidApp = (dir, returnPkg) => {
     if (!dir) dir = this.app.dir
-    dir = resolvePath(dir)
-    const hasMainDir = fs.existsSync(`${dir}/main`)
-    const hasPackageJson = fs.existsSync(`${dir}/package.json`)
-    return hasMainDir && hasPackageJson
+    return this.isValidAppPlugin(dir, 'app', returnPkg)
   }
 
-  isValidPlugin = (dir) => {
+  isValidPlugin = (dir, returnPkg) => {
     if (!dir) dir = this.app.dir
-    dir = resolvePath(dir)
-    const hasPluginDir = fs.existsSync(dir)
-    const hasPackageJson = fs.existsSync(`${dir}/package.json`)
-    return hasPluginDir && hasPackageJson
+    return this.isValidAppPlugin(dir, 'plugin', returnPkg)
   }
 
   join = (array, sep) => {

package/package.json

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