bajo 0.3.10 → 1.0.1

package/boot/class/bajo-core/method/build-collections.js

@@ -0,0 +1,46 @@
+import { filter, isArray, pullAt, camelCase, has, find, set, get, isFunction } from 'lodash-es'
+
+async function buildCollections (options = {}) {
+  const { runHook, join } = this.app.bajo
+  let { ns, handler, dupChecks = [], container, useDefaultName } = options
+  useDefaultName = useDefaultName ?? true
+  if (!ns) ns = this.name
+  const cfg = this.app[ns].getConfig()
+  let items = get(cfg, container, [])
+  if (!isArray(items)) items = [items]
+  this.app[ns].log.trace('Collecting %s', this.app[ns].print.write(container))
+  await runHook(`${ns}:${camelCase('beforeBuildCollection')}`, container)
+  const deleted = []
+  for (const index in items) {
+    const item = items[index]
+    if (useDefaultName) {
+      if (!has(item, 'name')) {
+        if (find(items, { name: 'default' })) throw this.app[ns].error('Collection \'default\' already exists')
+        else item.name = 'default'
+      }
+    }
+    this.app[ns].log.trace('- %s', item.name)
+    const result = await handler.call(this.app[ns], { item, index, cfg })
+    if (result) items[index] = result
+    else if (result === false) deleted.push(index)
+    if (this.app.bajo.applet && item.skipOnTool && !deleted.includes(index)) deleted.push(index)
+  }
+  if (deleted.length > 0) pullAt(items, deleted)
+
+  // check for duplicity
+  for (const c of items) {
+    for (const d of dupChecks) {
+      if (isFunction(d)) await d.call(this.app[ns], c, items)
+      else {
+        const checker = set({}, d, c[d])
+        const match = filter(items, checker)
+        if (match.length > 1) this.app[ns].fatal('One or more %s shared the same \'%s\'', container, join(dupChecks.filter(i => !isFunction(i))))
+      }
+    }
+  }
+  await runHook(`${ns}:${camelCase('afterBuildCollection')}`, container)
+  this.app[ns].log.debug('%s collected: %d', this.app[ns].print.write(container), items.length)
+  return items
+}
+
+export default buildCollections

package/boot/class/bajo-core/method/call-handler.js

@@ -0,0 +1,29 @@
+import { isString, isFunction, isPlainObject, find } from 'lodash-es'
+import BajoPlugin from '../../bajo-plugin.js'
+
+async function callHandler (item, ...args) {
+  let result
+  let scope = this
+  if (item instanceof BajoPlugin) {
+    scope = item
+    item = args.shift()
+  }
+  const bajo = scope.app.bajo
+  if (isString(item)) {
+    if (item.startsWith('applet:') && bajo.applets.length > 0) {
+      const [, ns, path] = item.split(':')
+      const applet = find(bajo.applets, a => (a.ns === ns || a.alias === ns))
+      if (applet) result = await bajo.runApplet(applet, path, ...args)
+    } else {
+      const method = bajo.getMethod(item)
+      if (method) result = await method(...args)
+    }
+  } else if (isFunction(item)) {
+    result = await item.call(scope, ...args)
+  } else if (isPlainObject(item) && item.handler) {
+    result = await item.handler.call(scope, ...args)
+  }
+  return result
+}
+
+export default callHandler

package/boot/{helper → class/bajo-core/method}/defaults-deep.js

@@ -1,5 +1,5 @@
 import { mergeWith, isArray } from 'lodash-es'
-// taken from https://github.com/nodeutils/defaults-deep/blob/master/lib/index.js
+// based on https://github.com/nodeutils/defaults-deep/blob/master/lib/index.js
 
 const defaultsDeep = (...args) => {
   const output = {}

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

@@ -0,0 +1,55 @@
+import { camelCase, isString, omit, cloneDeep } from 'lodash-es'
+import fastGlob from 'fast-glob'
+import path from 'path'
+
+async function eachPlugins (handler, options = {}) {
+  if (typeof options === 'string') options = { glob: options }
+  const result = {}
+  const pluginPkgs = cloneDeep(this.app.bajo.pluginPkgs) ?? []
+  const { glob, useBajo, prefix = '', noUnderscore = true, returnItems } = options
+  if (useBajo) pluginPkgs.unshift('bajo')
+  for (const pkgName of pluginPkgs) {
+    const ns = camelCase(pkgName)
+    const config = this.app[ns].config
+    const alias = this.app[ns].alias
+    let r
+    if (glob) {
+      const base = prefix === '' ? this.app[ns].dir.pkg : `${this.app[ns].dir.pkg}/${prefix}`
+      let opts = isString(glob) ? { pattern: [glob] } : glob
+      let pattern = opts.pattern ?? []
+      if (isString(pattern)) pattern = [pattern]
+      opts = omit(opts, ['pattern'])
+      for (const i in pattern) {
+        if (!path.isAbsolute(pattern[i])) pattern[i] = `${base}/${pattern[i]}`
+      }
+      const files = await fastGlob(pattern, opts)
+      for (const f of files) {
+        if (path.basename(f)[0] === '_' && noUnderscore) continue
+        const resp = await handler.call(this.app[ns], { ns, pkgName, config, alias, file: f, dir: base })
+        if (resp === false) break
+        else if (resp === undefined) continue
+        else {
+          result[ns] = result[ns] ?? {}
+          result[ns][f] = resp
+        }
+      }
+    } else {
+      r = await handler.call(this.app[ns], { ns, pkgName, config, dir: this.app[ns].dir.pkg, alias })
+      if (r === false) break
+      else if (r === undefined) continue
+      else result[ns] = r
+    }
+  }
+  if (returnItems) {
+    const data = []
+    for (const r in result) {
+      for (const f in result[r]) {
+        data.push(result[r][f])
+      }
+    }
+    return data
+  }
+  return result
+}
+
+export default eachPlugins

package/boot/class/bajo-core/method/envs.js

@@ -0,0 +1,7 @@
+const envs = {
+  dev: 'development',
+  staging: 'Staging',
+  prod: 'production'
+}
+
+export default envs

package/boot/{helper → class/bajo-core/method}/generate-id.js

@@ -2,9 +2,13 @@ import { customAlphabet } from 'nanoid'
 
 const generateId = (options = {}) => {
   let type
+  if (options === true) options = 'alpha'
   if (options === 'int') {
     type = options
     options = { pattern: '0123456789', length: 15 }
+  } else if (options === 'alpha') {
+    type = options
+    options = { pattern: 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', length: 15 }
   }
   let { pattern, length = 13, returnInstance } = options
   pattern = pattern ?? 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'

package/boot/{helper → class/bajo-core/method}/get-global-module-dir.js

@@ -1,16 +1,15 @@
 import globalModulesPath from 'global-modules-path'
 import resolvePath from './resolve-path.js'
-import error from './error.js'
 import { dropRight } from 'lodash-es'
 import fs from 'fs-extra'
 
-const getGlobalModuleDir = (pkgName, silent = true) => {
+function getGlobalModuleDir (pkgName, silent = true) {
   let nodeModulesDir = process.env.BAJO_GLOBAL_MODULE_DIR
   if (!nodeModulesDir) {
     const npmPath = globalModulesPath.getPath('npm')
     if (!npmPath) {
       if (silent) return
-      throw error('Can\'t locate npm global module directory', { code: 'BAJO_CANT_LOCATE_NPM_GLOBAL_DIR' })
+      throw this.error('Can\'t locate npm global module directory', { code: 'BAJO_CANT_LOCATE_NPM_GLOBAL_DIR' })
     }
     nodeModulesDir = dropRight(resolvePath(npmPath).split('/'), 1).join('/')
     process.env.BAJO_GLOBAL_MODULE_DIR = nodeModulesDir
@@ -19,7 +18,7 @@ const getGlobalModuleDir = (pkgName, silent = true) => {
   const dir = `${nodeModulesDir}/${pkgName}`
   if (!fs.existsSync(dir)) {
     if (silent) return
-    throw error('Can\'t locate \'%s\' global module directory', pkgName, { code: 'BAJO_CANT_LOCATE_MODULE_GLOBAL_DIR' })
+    throw this.error('Can\'t locate \'%s\' global module directory', pkgName, { code: 'BAJO_CANT_LOCATE_MODULE_GLOBAL_DIR' })
   }
   return dir
 }

package/boot/class/bajo-core/method/get-method.js

@@ -0,0 +1,10 @@
+import { get, isFunction } from 'lodash-es'
+
+function getMethod (name = '', thrown = true) {
+  const { ns, path } = this.breakNsPath(name)
+  const method = get(this.app, `${ns}.${path}`)
+  if (method && isFunction(method)) return method
+  if (thrown) throw this.error('Can\'t find method named \'%s\'', name)
+}
+
+export default getMethod

package/boot/{helper → class/bajo-core/method}/get-module-dir.js

@@ -1,6 +1,5 @@
 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'
@@ -19,9 +18,9 @@ function findDeep (item, paths) {
 }
 
 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')
+  if (pkgName === 'main') return resolvePath(process.env.BAJOCWD)
+  if (base === 'main') base = process.env.BAJOCWD
+  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 = getGlobalModuleDir()

package/boot/{helper → class/bajo-core/method}/get-plugin-data-dir.js

@@ -1,10 +1,9 @@
 import fs from 'fs-extra'
 
 function getPluginDataDir (name, ensureDir = true) {
-  const { getPlugin, getConfig } = this.bajo.helper
+  const { getPlugin } = this.app.bajo
   const plugin = getPlugin(name)
-  const cfg = getConfig()
-  const dir = `${cfg.dir.data}/plugins/${plugin.config.name}`
+  const dir = `${this.app.bajo.dir.data}/plugins/${plugin.name}`
   if (ensureDir) fs.ensureDirSync(dir)
   return dir
 }

package/boot/class/bajo-core/method/get-plugin-file.js

@@ -0,0 +1,18 @@
+import breakNsPath from './break-ns-path.js'
+import currentLoc from '../../../lib/current-loc.js'
+import { trim } from 'lodash-es'
+
+function getPluginFile (file) {
+  if (file[0] === '.') file = `${currentLoc(import.meta).dir}/${trim(file.slice(1), '/')}`
+  if (!this) return file
+  if (file.includes(':')) {
+    if (file.slice(1, 2) === ':') return file // windows fs
+    const { ns, path } = breakNsPath.call(this, file)
+    if (ns !== 'file' && this && this.app && this.app[ns] && ns.length > 1) {
+      file = `${this.app[ns].dir.pkg}${path}`
+    }
+  }
+  return file
+}
+
+export default getPluginFile

package/boot/class/bajo-core/method/get-plugin.js

@@ -0,0 +1,23 @@
+import BajoPlugin from '../../bajo-plugin.js'
+
+function getPlugin (name, silent) {
+  if (!this.app[name]) {
+    // alias?
+    let plugin
+    for (const key in this.app) {
+      const item = this.app[key]
+      if (item instanceof BajoPlugin && (item.alias === name || item.pkgName === name)) {
+        plugin = item
+        break
+      }
+    }
+    if (!plugin) {
+      if (silent) return false
+      throw this.error('Plugin with alias \'%s\' is not loaded', name)
+    }
+    name = plugin.name
+  }
+  return this.app[name]
+}
+
+export default getPlugin

package/boot/{helper → class/bajo-core/method}/import-module.js

@@ -1,10 +1,9 @@
 import resolvePath from './resolve-path.js'
 import getPluginFile from './get-plugin-file.js'
 import { isFunction, isPlainObject } from 'lodash-es'
-import error from './error.js'
 import fs from 'fs-extra'
 
-async function load (file, asDefaultImport = true, noCache = true) {
+async function load (file, asDefaultImport = true, noCache = false) {
   file = resolvePath(file, true)
   if (noCache) file += `?_=${Date.now()}`
   const imported = await import(file)
@@ -13,18 +12,13 @@ async function load (file, asDefaultImport = true, noCache = true) {
 }
 
 async function importModule (file, { asDefaultImport, asHandler, noCache } = {}) {
-  file = getPluginFile.call(this, file)
+  const me = this
+  file = getPluginFile.call(me, file)
   if (!fs.existsSync(file)) return
   let mod = await load(file, asDefaultImport, noCache)
   if (!asHandler) return mod
   if (isFunction(mod)) mod = { level: 999, handler: mod }
-  if (!isPlainObject(mod)) throw error.call(this, 'File \'%s\' is NOT a handler module', file)
-  if (mod.forceAsync && mod.handler.constructor.name !== 'AsyncFunction') {
-    const oldHandler = mod.handler
-    mod.handler = async function (...args) {
-      oldHandler.call(this, ...args)
-    }
-  }
+  if (!isPlainObject(mod)) throw this.error.call(me.app, 'File \'%s\' is NOT a handler module', file)
   return mod
 }
 

package/boot/{helper → class/bajo-core/method}/import-pkg.js

@@ -10,13 +10,18 @@ import fs from 'fs-extra'
 
 async function importPkg (...pkgs) {
   const result = {}
-  let opts = { returnDefault: true, thrownNotFound: false, noCache: false }
+  const notFound = []
+  let opts = { returnDefault: true, thrownNotFound: false }
   if (isPlainObject(last(pkgs))) {
     opts = defaultsDeep(pkgs.pop(), opts)
   }
   for (const pkg of pkgs) {
-    const [plugin, name] = breakNsPath.call(this, pkg)
-    const dir = getModuleDir.call(this, name, plugin)
+    const { ns, path: name } = breakNsPath.call(this, pkg)
+    const dir = getModuleDir.call(this, name, ns)
+    if (!dir) {
+      notFound.push(pkg)
+      continue
+    }
     const p = readJson(`${dir}/package.json`, opts.thrownNotFound)
     const mainFileOrg = dir + '/' + (p.main ?? get(p, 'exports.default', 'index.js'))
     let mainFile = resolvePath(mainFileOrg, os.platform() === 'win32')
@@ -32,6 +37,7 @@ async function importPkg (...pkgs) {
     }
     result[name] = mod
   }
+  if (notFound.length > 0) throw this.error('Can\'t find %s', this.join(notFound))
   if (pkgs.length === 1) return result[keys(result)[0]]
   if (opts.asObject) return result
   return values(result)

package/boot/class/bajo-core/method/includes.js

@@ -0,0 +1,13 @@
+import { isString } from 'lodash-es'
+
+function includes (matcher = [], array = []) {
+  if (isString(matcher)) matcher = [matcher]
+  let found = false
+  for (const m of matcher) {
+    found = array.includes(m)
+    if (found) break
+  }
+  return found
+}
+
+export default includes

package/boot/class/bajo-core/method/is-class.js

@@ -0,0 +1,7 @@
+function isClass (item) {
+  return typeof item === 'function' &&
+    Object.prototype.hasOwnProperty.call(item, 'prototype') &&
+    !Object.prototype.hasOwnProperty.call(item, 'arguments')
+}
+
+export default isClass

package/boot/{helper → class/bajo-core/method}/is-log-in-range.js

@@ -3,7 +3,7 @@ import { keys, indexOf } from 'lodash-es'
 
 function isLogInRange (level) {
   const levels = keys(logLevels)
-  const logLevel = indexOf(levels, this.bajo.config.log.level)
+  const logLevel = indexOf(levels, this.app.bajo.config.log.level)
   return indexOf(levels, level) >= logLevel
 }
 

package/boot/{helper → class/bajo-core/method}/is-valid-app.js

@@ -4,9 +4,9 @@ import resolvePath from './resolve-path.js'
 const isValidApp = (dir) => {
   if (!dir) dir = process.env.BAJOCWD
   dir = resolvePath(dir)
-  const hasAppDir = fs.existsSync(`${dir}/app/bajo`)
+  const hasMainDir = fs.existsSync(`${dir}/main/bajo`)
   const hasPackageJson = fs.existsSync(`${dir}/package.json`)
-  return hasAppDir && hasPackageJson
+  return hasMainDir && hasPackageJson
 }
 
 export default isValidApp

package/boot/class/bajo-core/method/join.js

@@ -0,0 +1,15 @@
+import { isPlainObject } from 'lodash-es'
+import isSet from './is-set.js'
+
+function join (array, sep) {
+  const isI18n = this && this.app && this.app.bajoI18N
+  if (array.length === 0) return isI18n ? this.app.bajoI18N.t('none') : 'none'
+  if (array.length === 1) return array[0]
+  if (isSet(sep) && !isPlainObject(sep)) return array.join(sep)
+  let { separator = ', ', joiner = 'and' } = sep ?? {}
+  if (isI18n && this.app.bajoI18N.t) joiner = this.app.bajoI18N.t(joiner)
+  const last = (array.pop() ?? '').trim()
+  return array.map(a => (a + '').trim()).join(separator) + ` ${joiner} ${last}`
+}
+
+export default join

package/boot/class/bajo-core/method/log-levels.js

@@ -0,0 +1,9 @@
+export default {
+  trace: 10,
+  debug: 20,
+  info: 30,
+  warn: 40,
+  error: 50,
+  fatal: 60,
+  silent: 99
+}

package/boot/class/bajo-core/method/num-unit.js

@@ -0,0 +1,9 @@
+import { isEmpty } from 'lodash-es'
+
+function numUnit (value = '', defUnit = '') {
+  const num = value.match(/\d+/g)
+  const unit = value.match(/[a-zA-Z]+/g)
+  return `${num[0]}${isEmpty(unit) ? defUnit : unit[0]}`
+}
+
+export default numUnit

package/boot/{helper → class/bajo-core/method}/parse-object.js

@@ -1,8 +1,9 @@
-import { isPlainObject, isArray, isNumber, set, cloneDeep } from 'lodash-es'
+import { isPlainObject, isArray, isNumber, set, cloneDeep, isString, omit } from 'lodash-es'
 import dotenvParseVariables from 'dotenv-parse-variables'
 import ms from 'ms'
-import dayjs from '../lib/dayjs.js'
+import dayjs from '../../../lib/dayjs.js'
 import isSet from './is-set.js'
+import translate from '../../../lib/translate.js'
 
 const statics = ['*']
 
@@ -12,13 +13,15 @@ function parseDur (val) {
 
 function parseDt (val) {
   const dt = dayjs(val)
-  if (!dt.isValid()) throw Error(`Unparsed date/time '${val}'`)
+  if (!dt.isValid()) throw this.error('Unparsed date/time \'%s\'', val)
   return dt.toDate()
 }
 
-function parseObject (input, silent = true, parseValue = false) {
-  const obj = cloneDeep(input)
+function parseObject (input, { silent = true, parseValue = false, i18n, ns } = {}) {
+  let obj = cloneDeep(input)
   const keys = Object.keys(obj)
+  const me = this
+  const mutated = []
   keys.forEach(k => {
     const v = obj[k]
     if (isPlainObject(v)) obj[k] = parseObject(v)
@@ -32,18 +35,31 @@ function parseObject (input, silent = true, parseValue = false) {
     } else if (isSet(v)) {
       try {
         if (statics.includes(v)) obj[k] = v
-        else if (parseValue) {
+        else if (k.startsWith('t:') && isString(v)) {
+          const newK = k.slice(2)
+          if (i18n) {
+            const scope = ns ? me.app[ns] : me
+            let [text, ...args] = v.split('|')
+            args = args.map(a => {
+              if (a.slice(0, 2) === 't:') a = translate.call(scope, i18n, a.slice(2))
+              return a
+            })
+            obj[newK] = translate.call(scope, i18n, text, ...args)
+          } else obj[newK] = v
+          mutated.push(k)
+        } else if (parseValue) {
           obj[k] = dotenvParseVariables(set({}, 'item', v), { assignToProcessEnv: false }).item
           if (isArray(obj[k])) obj[k] = obj[k].map(item => typeof item === 'string' ? item.trim() : item)
         }
-        if (k.slice(-3) === 'Dur') obj[k] = parseDur(v)
-        if (k.slice(-2) === 'Dt') obj[k] = parseDt(v)
+        if (k.slice(-3) === 'Dur') obj[k] = parseDur.call(me, v)
+        if (k.slice(-2) === 'Dt') obj[k] = parseDt.call(me, v)
       } catch (err) {
         obj[k] = undefined
         if (!silent) throw err
       }
     }
   })
+  if (mutated.length > 0) obj = omit(obj, mutated)
   return obj
 }
 

package/boot/class/bajo-core/method/read-config.js

@@ -0,0 +1,48 @@
+import path from 'path'
+import resolvePath from './resolve-path.js'
+import getPluginFile from './get-plugin-file.js'
+import readJson from './read-json.js'
+import parseObject from './parse-object.js'
+import { find, map, isEmpty } from 'lodash-es'
+import fg from 'fast-glob'
+
+async function readConfig (file, { ns, pattern, globOptions = {}, ignoreError, defValue = {}, opts = {} } = {}) {
+  if (!ns) ns = this.name
+  file = resolvePath(getPluginFile.call(this, file))
+  let ext = path.extname(file)
+  const fname = path.dirname(file) + '/' + path.basename(file, ext)
+  ext = ext.toLowerCase()
+  if (['.mjs', '.js'].includes(ext)) {
+    const { readHandler } = find(this.app.bajo.configHandlers, { ext })
+    return parseObject(await readHandler.call(this.app[ns], file, opts))
+  }
+  if (ext === '.json') return await readJson(file)
+  if (!['', '.*'].includes(ext)) {
+    const item = find(this.app.bajo.configHandlers, { ext })
+    if (!item) {
+      if (!ignoreError) throw this.error('Can\'t parse \'%s\'', file, { code: 'BAJO_CONFIG_NO_PARSER' })
+      return parseObject(defValue)
+    }
+    return parseObject(await item.readHandler.call(this.app[ns], file, opts))
+  }
+  const item = pattern ?? `${fname}.{${map(map(this.app.bajo.configHandlers, 'ext'), k => k.slice(1)).join(',')}}`
+  const files = await fg(item, globOptions)
+  if (files.length === 0) {
+    if (!ignoreError) throw this.error('No config file found', { code: 'BAJO_CONFIG_FILE_NOT_FOUND' })
+    return parseObject(defValue)
+  }
+  let config = defValue
+  for (const f of files) {
+    const ext = path.extname(f).toLowerCase()
+    const item = find(this.app.bajo.configHandlers, { ext })
+    if (!item) {
+      if (!ignoreError) throw this.error('Can\'t parse \'%s\'', f, { code: 'BAJO_CONFIG_NO_PARSER' })
+      continue
+    }
+    config = await item.readHandler.call(this.app[ns], f, opts)
+    if (!isEmpty(config)) break
+  }
+  return parseObject(config)
+}
+
+export default readConfig

package/boot/{helper → class/bajo-core/method}/read-json.js

@@ -2,8 +2,8 @@ import fs from 'fs-extra'
 import { isEmpty } from 'lodash-es'
 import parseObject from './parse-object.js'
 
-const readJson = (file, thrownNotFound) => {
-  if (!fs.existsSync(file) && thrownNotFound) throw new Error('File \'%s\' not found', file)
+function readJson (file, thrownNotFound) {
+  if (!fs.existsSync(file) && thrownNotFound) throw this.error('File \'%s\' not found', file)
   let resp = fs.readFileSync(file, 'utf8')
   if (isEmpty(resp)) resp = '{}'
   return parseObject(JSON.parse(resp))

package/boot/class/bajo-core/method/run-hook.js

@@ -0,0 +1,26 @@
+import { filter, isEmpty, orderBy, pullAt } from 'lodash-es'
+
+async function runHook (hookName, ...args) {
+  const [ns, path] = (hookName ?? '').split(':')
+  let fns = filter(this.app.bajo.hooks, { ns, path })
+  if (isEmpty(fns)) return
+  fns = orderBy(fns, ['level'])
+  const results = []
+  const removed = []
+  for (const i in fns) {
+    const fn = fns[i]
+    const scope = this.app[fn.src]
+    const res = await fn.handler.call(scope, ...args)
+    results.push({
+      hook: hookName,
+      resp: res
+    })
+    if (path.startsWith('once')) removed.push(i)
+    if (this.config.log.traceHook) scope.log.trace('Hook \'%s\' executed', hookName)
+  }
+  if (removed.length > 0) pullAt(this.app.bajo.hooks, removed)
+
+  return results
+}
+
+export default runHook

package/boot/{helper → class/bajo-core/method}/save-as-download.js

@@ -4,8 +4,8 @@ import { trim } from 'lodash-es'
 import increment from 'add-filename-increment'
 
 async function saveAsDownload (file, obj, printSaved = true) {
-  const { print, getPluginName, getPluginDataDir } = this.bajo.helper
-  const plugin = getPluginName(4)
+  const { print, getPluginDataDir } = this.app.bajo
+  const plugin = this.name
   const fname = increment(`${getPluginDataDir(plugin)}/${trim(file, '/')}`, { fs: true })
   const dir = path.dirname(fname)
   if (!fs.existsSync(dir)) fs.ensureDirSync(dir)

package/boot/class/bajo-core/method/slice-string.js

@@ -0,0 +1,13 @@
+function sliceString (content, start, end) {
+  const idx1 = content.indexOf(start)
+  if (idx1 === -1) return false
+  let idx2 = content.indexOf(end)
+  if (idx2 === -1) return false
+  if (idx2 < idx1) {
+    const tmp = content.slice(idx1)
+    idx2 = tmp.indexOf(end) + idx1
+  }
+  return content.slice(idx1, idx2 + end.length)
+}
+
+export default sliceString

package/boot/class/bajo-core/method/titleize.js

@@ -0,0 +1,23 @@
+import { words, upperFirst, map, concat, uniq, forOwn } from 'lodash-es'
+import generateId from './generate-id.js'
+
+const defIgnores = ['or', 'and', 'of', 'with']
+
+const titleize = (text, { ignores = [], replacement = {} } = {}) => {
+  const replacer = {}
+  forOwn(replacement, (v, k) => {
+    const id = generateId('int')
+    replacer[id] = k
+    text = text.replace(k, ` ${id} `)
+  })
+  return map(words(text), t => {
+    forOwn(replacer, (v, k) => {
+      if (k === t) t = replacement[replacer[k]]
+    })
+    ignores = uniq(concat(ignores, defIgnores))
+    if (ignores.includes(t)) return t
+    return upperFirst(t)
+  }).join(' ')
+}
+
+export default titleize