bajo 1.1.19 → 1.2.1

package/boot/class/bajo-core/boot-order.js

@@ -15,10 +15,10 @@ async function bootOrder () {
   for (let n of this.pluginPkgs) {
     n = map(n.split(':'), m => trim(m))[0]
     const dir = n === this.mainNs ? (`${this.dir.base}/${this.mainNs}`) : this.getModuleDir(n)
-    if (n !== this.mainNs && !fs.existsSync(`${dir}/plugin`)) throw this.error('packageNotFoundOrNotBajo%s', n)
+    if (n !== this.mainNs && !fs.existsSync(dir)) throw this.error('packageNotFoundOrNotBajo%s', n)
     norder[n] = NaN
     try {
-      norder[n] = Number(trim(await fs.readFile(`${dir}/plugin/.bootorder`, 'utf8')))
+      norder[n] = Number(trim(await fs.readFile(`${dir}/.bootorder`, 'utf8')))
     } catch (err) {}
   }
   const result = []

package/boot/class/bajo-core/boot-plugins.js

@@ -4,7 +4,6 @@ import checkClash from '../bajo-plugin/check-clash.js'
 import attachMethod from '../bajo-plugin/attach-method.js'
 import collectHooks from '../bajo-plugin/collect-hooks.js'
 import run from '../bajo-plugin/run.js'
-import collectExitHandlers from '../bajo-plugin/collect-exit-handlers.js'
 
 async function bootPlugins () {
   await buildConfig.call(this.app)
@@ -12,7 +11,6 @@ async function bootPlugins () {
   await checkDependency.call(this.app)
   await attachMethod.call(this.app)
   await collectHooks.call(this.app)
-  await collectExitHandlers.call(this.app)
   await run.call(this.app)
 }
 

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

@@ -24,12 +24,9 @@ async function buildPlugins () {
       dir = `${this.dir.base}/${this.mainNs}`
       fs.ensureDirSync(dir)
       fs.ensureDirSync(`${dir}/plugin`)
-    } else {
-      dir = this.getModuleDir(pkg)
-      if (!fs.existsSync(`${dir}/plugin`)) throw new Error(`Package '${pkg}' isn't a valid Bajo package`)
-    }
+    } else dir = this.getModuleDir(pkg)
     let plugin
-    const factory = `${dir}/plugin/factory.js`
+    const factory = `${dir}/index.js`
     if (fs.existsSync(factory)) {
       const { default: builder } = await import(resolvePath(factory, true))
       const FactoryClass = await builder.call(this, pkg)

package/boot/class/bajo-core/exit-handler.js

@@ -2,10 +2,8 @@ async function exit (signal) {
   const { eachPlugins } = this
   this.log.warn('signalReceived%s', signal)
   await eachPlugins(async function ({ ns }) {
-    const handler = this.exitHandler
-    if (!handler) return undefined
     try {
-      await handler.call(this)
+      await this.stop()
     } catch (err) {}
     this.log.debug('exited')
   })

package/boot/class/bajo-core.js

@@ -1,6 +1,5 @@
 import Plugin from './plugin.js'
 import BajoPlugin from './bajo-plugin.js'
-import dayjs from '../lib/dayjs.js'
 import increment from 'add-filename-increment'
 import fs from 'fs-extra'
 import path from 'path'
@@ -16,8 +15,6 @@ import { customAlphabet } from 'nanoid'
 import fastGlob from 'fast-glob'
 import querystring from 'querystring'
 import deepFreeze from 'deep-freeze-strict'
-import { sprintf } from 'sprintf-js'
-import outmatch from 'outmatch'
 import resolvePath from '../lib/resolve-path.js'
 import importModule from '../lib/import-module.js'
 import logLevels from '../lib/log-levels.js'
@@ -37,12 +34,6 @@ class BajoCore extends Plugin {
     super('bajo', app)
     this.runAt = new Date()
     this.mainNs = 'main'
-    this.lib._ = lodash
-    this.lib.fs = fs
-    this.lib.fastGlob = fastGlob
-    this.lib.sprintf = sprintf
-    this.lib.outmatch = outmatch
-    this.lib.dayjs = dayjs
     this.lib.BajoPlugin = BajoPlugin
     this.applets = []
     this.pluginPkgs = []
@@ -115,11 +106,31 @@ class BajoCore extends Plugin {
       }
       if (!this.app[ns]) throw this.error('unknownPluginOrNotLoaded%s')
     }
-    const fullPath = path
     let qs
     [path, qs] = path.split('?')
     qs = querystring.parse(qs) ?? {}
-    return { ns, path, subNs, subSubNs, qs, fullPath, fullNs }
+    // normalize path
+    const parts = path.split('/')
+    const realParts = []
+    const params = {}
+    for (const idx in parts) {
+      const part = parts[idx]
+      if (part[0] !== ':' || part.indexOf('|') === -1) {
+        realParts.push(part)
+        continue
+      }
+      const [key, val] = part.split('|')
+      parts[idx] = key
+      params[key.slice(1)] = val
+      realParts.push(val)
+    }
+    path = parts.join('/')
+    const realPath = realParts.join('/')
+    let fullPath = path
+    if (!isEmpty(qs)) fullPath += ('?' + querystring.stringify(qs))
+    let realFullPath = realPath
+    if (!isEmpty(qs)) realFullPath += ('?' + querystring.stringify(qs))
+    return { ns, path, subNs, subSubNs, qs, fullPath, fullNs, realPath, realFullPath }
   }
 
   buildCollections = async (options = {}) => {
@@ -382,8 +393,7 @@ class BajoCore extends Plugin {
   }
 
   getPluginDataDir = (name, ensureDir = true) => {
-    const { getPlugin } = this.app.bajo
-    const plugin = getPlugin(name)
+    const plugin = this.getPlugin(name)
     const dir = `${this.app.bajo.dir.data}/plugins/${plugin.name}`
     if (ensureDir) fs.ensureDirSync(dir)
     return dir
@@ -476,7 +486,7 @@ class BajoCore extends Plugin {
   isValidApp = (dir) => {
     if (!dir) dir = this.app.dir
     dir = resolvePath(dir)
-    const hasMainDir = fs.existsSync(`${dir}/main/plugin`)
+    const hasMainDir = fs.existsSync(`${dir}/main`)
     const hasPackageJson = fs.existsSync(`${dir}/package.json`)
     return hasMainDir && hasPackageJson
   }
@@ -484,7 +494,7 @@ class BajoCore extends Plugin {
   isValidPlugin = (dir) => {
     if (!dir) dir = this.app.dir
     dir = resolvePath(dir)
-    const hasPluginDir = fs.existsSync(`${dir}/plugin`)
+    const hasPluginDir = fs.existsSync(dir)
     const hasPackageJson = fs.existsSync(`${dir}/package.json`)
     return hasPluginDir && hasPackageJson
   }
@@ -649,8 +659,7 @@ class BajoCore extends Plugin {
 
   saveAsDownload = async (file, obj, printSaved = true) => {
     const { print, getPluginDataDir } = this.app.bajo
-    const plugin = this.name
-    const fname = increment(`${getPluginDataDir(plugin)}/${trim(file, '/')}`, { fs: true })
+    const fname = increment(`${getPluginDataDir(this.name)}/${trim(file, '/')}`, { fs: true })
     const dir = path.dirname(fname)
     if (!fs.existsSync(dir)) fs.ensureDirSync(dir)
     await fs.writeFile(fname, obj, 'utf8')

package/boot/class/bajo-plugin/attach-method.js

@@ -6,7 +6,7 @@ async function attachMethod () {
   me.bajo.log.debug('attachMethods')
   await eachPlugins(async function ({ ns, pkgName }) {
     const dir = ns === me.bajo.mainNs ? (`${me.bajo.dir.base}/${me.bajo.mainNs}`) : me.bajo.getModuleDir(pkgName)
-    const num = await createMethod.call(me[ns], `${dir}/plugin/method`, pkgName)
+    const num = await createMethod.call(me[ns], `${dir}/plugin-method`, pkgName)
     me.bajo.log.trace('- %s (%d)', ns, num)
   })
 }

package/boot/class/bajo-plugin/run.js

@@ -4,11 +4,13 @@ const { camelCase, map } = lodash
 async function run () {
   const me = this
   const { runHook, eachPlugins, join } = me.bajo
+  const { freeze } = me.bajo
   const methods = ['init']
   if (!me.bajo.applet) methods.push('start')
   for (const method of methods) {
     await runHook(`bajo:${camelCase(`before ${method} all plugins`)}`)
     await eachPlugins(async function ({ ns }) {
+      if (method === 'start') freeze(me[ns].config)
       await runHook(`${ns}:${camelCase(`before ${method}`)}`)
       await me[ns][method]()
       await runHook(`${ns}:${camelCase(`after ${method}`)}`)

package/boot/class/bajo-plugin.js

@@ -2,9 +2,8 @@ import Plugin from './plugin.js'
 import lodash from 'lodash'
 import omittedPluginKeys from '../lib/omitted-plugin-keys.js'
 import readAllConfigs from '../lib/read-all-configs.js'
-import fs from 'fs-extra'
 
-const { pick, omit, camelCase, trim, without } = lodash
+const { pick, omit } = lodash
 
 class BajoPlugin extends Plugin {
   constructor (pkgName, app) {
@@ -14,14 +13,12 @@ class BajoPlugin extends Plugin {
 
   loadConfig = async () => {
     const { defaultsDeep } = this.lib.aneka
-    const { log, getModuleDir, readJson, parseObject } = this.app.bajo
+    const { log, readJson, parseObject, getModuleDir } = this.app.bajo
     log.trace('- %s', this.name)
     const dir = this.name === this.app.bajo.mainNs ? (`${this.app.bajo.dir.base}/${this.app.bajo.mainNs}`) : getModuleDir(this.pkgName)
-    let cfg = await readAllConfigs.call(this.app, `${dir}/plugin/config`)
+    let cfg = await readAllConfigs.call(this.app, `${dir}/config`)
     this.alias = this.alias ?? (this.pkgName.slice(0, 5) === 'bajo-' ? this.pkgName.slice(5).toLowerCase() : this.name.toLowerCase())
-    const aliasFile = `${dir}/plugin/.alias`
-    if (fs.existsSync(aliasFile)) this.alias = fs.readFileSync(aliasFile, 'utf8')
-    this.alias = camelCase(this.alias)
+    this.alias = this.alias.toLowerCase()
 
     this.dir = {
       pkg: dir,
@@ -45,37 +42,16 @@ class BajoPlugin extends Plugin {
     this.title = this.title ?? cfg.title ?? this.alias
 
     this.dependencies = this.dependencies ?? []
-    const depFile = `${dir}/plugin/.dependencies`
-    if (fs.existsSync(depFile)) this.dependencies = without(fs.readFileSync(depFile, 'utf8').split('\n').map(item => trim(item)), '')
-    this.config = parseObject(omit(cfg, ['title', 'dependencies']), { parseValue: true })
-  }
-
-  _onoff = async (item, ...args) => {
-    this.state[item] = false
-    const { runHook, importModule } = this.app.bajo
-    const mod = await importModule(`${this.dir.pkg}/plugin/${item}.js`)
-    if (mod) {
-      const text = this.print.write('plugin%s', this.print.write(item))
-      this.log.trace(text)
-      await runHook(`${this.name}:${camelCase(`before ${item}`)}`)
-      await mod.call(this, ...args)
-      await runHook(`${this.name}:${camelCase(`after ${item}`)}`)
-    }
-    this.state[item] = true
+    this.config = parseObject(cfg, { parseValue: true })
   }
 
   init = async () => {
-    await this._onoff('init')
   }
 
-  start = async (...args) => {
-    const { freeze } = this.app.bajo
-    freeze(this.config)
-    await this._onoff('start', ...args)
+  start = async () => {
   }
 
   stop = async () => {
-    await this._onoff('stop')
   }
 }
 

package/boot/class/plugin.js

@@ -43,7 +43,6 @@ class Plugin {
     this.config = {}
     this.lib = lib
     this.lib.outmatchNs = outmatchNs.bind(this)
-    this.exitHandler = undefined
   }
 
   getConfig = (path, options = {}) => {

package/package.json

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

package/boot/class/bajo-plugin/collect-exit-handlers.js

@@ -1,14 +0,0 @@
-async function collectExitHandlers () {
-  const { importModule, eachPlugins, print, join } = this.bajo
-  if (!this.bajo.config.exitHandler) return
-  const nss = []
-  await eachPlugins(async function ({ ns, dir }) {
-    const mod = await importModule(`${dir}/plugin/exit.js`)
-    if (!mod) return undefined
-    this.app[ns].exitHandler = mod
-    nss.push(ns)
-  })
-  this.bajo.log.trace('exitHandlers%s', nss.length === 0 ? print.write('none') : join(nss))
-}
-
-export default collectExitHandlers