bajo 1.1.6 → 1.1.8

package/boot/class/app.js

@@ -22,9 +22,8 @@ class App {
       const parts = l.split('=')
       cwd = parts[1]
     }
-    cwd = resolvePath(cwd)
-    process.env.BAJOCWD = cwd
-    this.cwd = cwd
+    this.dir = resolvePath(cwd)
+    process.env.APPDIR = this.dir
   }
 
   addPlugin = (plugin) => {

package/boot/class/bajo-core/build-config.js

@@ -36,7 +36,7 @@ export async function buildBaseConfig () {
   this.applet = this.app.argv._.applet
   this.config = this.defaultsDeep({}, this.app.env._, this.app.argv._)
   this.alias = this.name
-  set(this, 'dir.base', this.app.cwd)
+  set(this, 'dir.base', this.app.dir)
   const path = currentLoc(import.meta).dir + '/../../..'
   set(this, 'dir.pkg', this.resolvePath(path))
   if (!get(this, 'dir.data')) set(this, 'dir.data', `${this.dir.base}/data`)

package/boot/class/bajo-core.js

@@ -377,14 +377,14 @@ class BajoCore extends Plugin {
   }
 
   getModuleDir = (pkgName, base) => {
-    if (pkgName === 'main') return resolvePath(process.env.BAJOCWD)
-    if (base === 'main') base = process.env.BAJOCWD
+    if (pkgName === 'main') return resolvePath(this.app.dir)
+    if (base === 'main') base = this.app.dir
     else if (this && this.app && this.app[base]) base = this.app[base].pkgName
     const pkgPath = pkgName + '/package.json'
     const paths = require.resolve.paths(pkgPath)
     const gdir = this.getGlobalModuleDir()
     paths.unshift(gdir)
-    paths.unshift(resolvePath(path.join(process.env.BAJOCWD, 'node_modules')))
+    paths.unshift(resolvePath(path.join(this.app.dir, 'node_modules')))
     let dir = this.findDeep(pkgPath, paths)
     if (base && !dir) dir = this.findDeep(`${base}/node_modules/${pkgPath}`, paths)
     if (!dir) return null
@@ -503,7 +503,7 @@ class BajoCore extends Plugin {
   }
 
   isValidApp = (dir) => {
-    if (!dir) dir = process.env.BAJOCWD
+    if (!dir) dir = this.app.dir
     dir = resolvePath(dir)
     const hasMainDir = fs.existsSync(`${dir}/main/plugin`)
     const hasPackageJson = fs.existsSync(`${dir}/package.json`)
@@ -511,7 +511,7 @@ class BajoCore extends Plugin {
   }
 
   isValidPlugin = (dir) => {
-    if (!dir) dir = process.env.BAJOCWD
+    if (!dir) dir = this.app.dir
     dir = resolvePath(dir)
     const hasPluginDir = fs.existsSync(`${dir}/plugin`)
     const hasPackageJson = fs.existsSync(`${dir}/package.json`)

package/boot/class/bajo-plugin.js

@@ -32,7 +32,7 @@ class BajoPlugin extends Plugin {
       ['name', 'version', 'description', 'author', 'license', 'homepage'])
     if (this.name === this.app.bajo.mainNs) {
       this.alias = this.app.bajo.mainNs
-      this.title = this.alias
+      this.title = this.title ?? this.alias
     }
     // merge with config from datadir
     try {

package/boot/class/log.js

@@ -54,6 +54,10 @@ class Log {
       data = null
     }
     args = without(args, undefined)
+    if (data instanceof Error) {
+      msg = 'error%s'
+      args = [data.message]
+    }
     msg = `[${this.plugin.name}] ${this.write(msg, ...args)}`
     if (this.plugin.app[this.bajoLog] && this.plugin.app[this.bajoLog].logger) {
       this.plugin.app[this.bajoLog].logger[level](data, msg, ...args)
@@ -69,7 +73,10 @@ class Log {
         text = `[${dayjs(dt).utc(true).format(this.format)}] ${upperFirst(level)}: ${msg}`
         if (!isEmpty(data)) text += '\n' + JSON.stringify(data)
       }
-      if (!this.isIgnored(level)) console.log(text)
+      if (!this.isIgnored(level)) {
+        console.log(text)
+        if (data instanceof Error && level === 'trace') console.error(data)
+      }
     }
   }
 }

package/package.json

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