bajo 0.1.0 → 0.2.1

package/bajoBook/book/reference/pages/helper/get-key-by-value.md

@@ -0,0 +1,13 @@
+---
+title: function getKeyByValue()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/get-module-dir.md

@@ -0,0 +1,13 @@
+---
+title: function getModuleDir()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/get-plugin-data-dir.md

@@ -0,0 +1,13 @@
+---
+title: function getPluginDataDir()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/get-plugin-name.md

@@ -0,0 +1,13 @@
+---
+title: function getPluginName()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/get-plugin.md

@@ -0,0 +1,13 @@
+---
+title: function getPlugin()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/import-module.md

@@ -0,0 +1,13 @@
+---
+title: async function importModule()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/import-pkg.md

@@ -0,0 +1,13 @@
+---
+title: async function importPkg()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/is-empty-dir.md

@@ -0,0 +1,13 @@
+---
+title: async function isEmptyDir()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/is-log-in-range.md

@@ -0,0 +1,13 @@
+---
+title: function isLogInRange()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/is-set.md

@@ -0,0 +1,13 @@
+---
+title: function isSet()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/is-valid-app.md

@@ -0,0 +1,13 @@
+---
+title: function isValidApp()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/is-valid-plugin.md

@@ -0,0 +1,13 @@
+---
+title: function isValidPlugin()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/log-levels.md

@@ -0,0 +1,13 @@
+---
+title: object logLevels
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/log.md

@@ -0,0 +1,13 @@
+---
+title: object log
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/paginate.md

@@ -0,0 +1,13 @@
+---
+title: function paginate()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/pascal-case.md

@@ -0,0 +1,13 @@
+---
+title: function pascalCase()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/print.md

@@ -0,0 +1,13 @@
+---
+title: object print
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/read-config.md

@@ -0,0 +1,13 @@
+---
+title: async function readConfig()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/read-json.md

@@ -0,0 +1,13 @@
+---
+title: function readJson()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/resolve-path.md

@@ -0,0 +1,13 @@
+---
+title: function resolvePath()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/resolve-tpl-path.md

@@ -0,0 +1,13 @@
+---
+title: function resolveTplPath()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/run-hook.md

@@ -0,0 +1,13 @@
+---
+title: async function runHook()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/save-as-download.md

@@ -0,0 +1,13 @@
+---
+title: async function saveAsDownload()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/titleize.md

@@ -0,0 +1,13 @@
+---
+title: function titleize()
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/bajoBook/book/reference/pages/helper/white-space.md

@@ -0,0 +1,13 @@
+---
+title: array whiteSpace
+---
+
+###### Parameters:
+
+| Name | Type | Default Value | Description |
+| ---- | ---- | ------------- | ----------- |
+
+###### Returns:
+
+
+#### Example

package/boot/attach-helper.js

@@ -18,9 +18,17 @@ export default async function () {
   }
   this.bajo.helper.log = logger.call(this)
   this.bajo.helper.dayjs = dayjs
+  this.bajo.helper.setImmediate = function () {
+    return new Promise((resolve) => {
+      setImmediate(() => resolve())
+    })
+  }
   this.bajo.helper.freeze(this.bajo.helper, true)
   // last cleanup
   if (!fs.existsSync(this.bajo.config.dir.data)) {
     this.bajo.helper.log.warn('Data directory \'%s\' is not set yet!', this.bajo.config.dir.data)
   }
+  if (this.bajo.config.env === 'dev') {
+    this.dump = this.bajo.helper.dump
+  }
 }

package/boot/build-config.js

@@ -14,9 +14,10 @@ import defaultsDeep from './helper/defaults-deep.js'
 import parseArgsArgv from './lib/parse-args-argv.js'
 import parseEnv from './lib/parse-env.js'
 import error from './helper/error.js'
+import currentLoc from './helper/current-loc.js'
 
 const configFilePick = ['log', 'plugins', 'env', 'run']
-const configFileOmit = ['tool', 'spawn', 'cwd']
+const configFileOmit = ['tool', 'spawn', 'cwd', 'name', 'alias']
 
 const defConfig = {
   dir: {},
@@ -25,7 +26,7 @@ const defConfig = {
     report: [],
     tool: false
   },
-  lang: Intl.DateTimeFormat().resolvedOptions().lang,
+  lang: Intl.DateTimeFormat().resolvedOptions().lang ?? 'en-US',
   plugins: ['app'],
   env: 'dev',
   tool: false,
@@ -59,8 +60,11 @@ async function buildConfig (cwd) {
   const { args, argv } = await parseArgsArgv()
   const env = parseEnv()
   const envArgv = defaultsDeep({}, env.root, argv.root)
+  envArgv.name = 'bajo'
+  envArgv.alias = 'bajo'
   // directories
   set(envArgv, 'dir.base', cwd)
+  set(envArgv, 'dir.pkg', resolvePath(currentLoc(import.meta).dir + '/..'))
   if (!get(envArgv, 'dir.data')) set(envArgv, 'dir.data', `${envArgv.dir.base}/data`)
   envArgv.dir.data = resolvePath(envArgv.dir.data)
   if (!envArgv.dir.tmp) {
@@ -81,7 +85,8 @@ async function buildConfig (cwd) {
   if (config.silent) config.log.level = 'silent'
   // sanitize plugins
   config.plugins = without(config.plugins, 'app')
-  if (fs.existsSync(`${config.dir.base}/app/bajo`)) config.plugins.push('app')
+  // if (fs.existsSync(`${config.dir.base}/app/bajo`)) config.plugins.push('app')
+  config.plugins.push('app')
   config.plugins = filter(uniq(map(config.plugins, b => trim(b))), b => !isEmpty(b))
   if (config.tool) {
     if (!config.plugins.includes('bajo-cli')) throw error('Sidetool needs to have \'bajo-cli\' package loaded first')

package/boot/exit-handler.js

@@ -4,7 +4,9 @@ async function exit (signal) {
   await eachPlugins(async function ({ plugin }) {
     const handler = this.bajo.exitHandler[plugin]
     if (!handler) return undefined
-    await handler.call(this)
+    try {
+      await handler.call(this)
+    } catch (err) {}
     log.debug('Exited: %s', plugin)
   })
   log.debug('Program shutdown')

package/boot/helper/break-ns-path.js

@@ -0,0 +1,17 @@
+import { isEmpty } from 'lodash-es'
+
+function breakNsPath (item = '') {
+  const { error, getPlugin } = this.bajo.helper
+  let [ns, ...path] = item.split(':')
+  path = path.join(':')
+  if (isEmpty(path)) {
+    path = ns
+    ns = null
+  }
+  // if (path.startsWith('.')) throw error('Path \'%s\' must be an absolute path', path)
+  if (!this[ns]) ns = (getPlugin(ns) || {}).name
+  if (!this[ns]) throw error('Unknown plugin \'%s\' or plugin isn\'t loaded yet', ns)
+  return [ns, path]
+}
+
+export default breakNsPath

package/boot/helper/build-collections.js

@@ -1,40 +1,34 @@
 import { filter, isArray, each, pullAt, camelCase } from 'lodash-es'
 
-async function buildCollections ({ name, handler, dupChecks, container = 'connections' } = {}) {
+async function buildCollections (options = {}) {
   const { getConfig, getPluginName, fatal, runHook } = this.bajo.helper
-  if (!name) name = getPluginName(4)
-  const options = getConfig(name, { full: true })
-  if (!options[container]) return []
-  if (!isArray(options[container])) options[container] = [options[container]]
-  options[container] = options[container] ?? []
-  await runHook(`${name}:${camelCase(`before build ${container}`)}`)
+  let { plugin, handler, dupChecks = [], container = 'connections' } = options
+  if (!plugin) plugin = getPluginName(4)
+  const cfg = getConfig(plugin, { full: true })
+  if (!cfg[container]) return []
+  if (!isArray(cfg[container])) cfg[container] = [cfg[container]]
+  cfg[container] = cfg[container] ?? []
+  await runHook(`${plugin}:${camelCase(`before build ${container}`)}`)
   const deleted = []
-  for (const index in options[container]) {
-    const item = options[container][index]
-    const result = await handler.call(this, { item, index, options })
-    if (result) options[container][index] = result
+  for (const index in cfg[container]) {
+    const item = cfg[container][index]
+    const result = await handler.call(this, { item, index, cfg })
+    if (result) cfg[container][index] = result
     else if (result === false) deleted.push(index)
   }
-  if (deleted.length > 0) pullAt(options[container], deleted)
+  if (deleted.length > 0) pullAt(cfg[container], deleted)
 
   // check for duplicity
-  each(options[container], c => {
+  each(cfg[container], c => {
     const checker = {}
     each(dupChecks, d => {
       checker[d] = c[d]
     })
-    const match = filter(options[container], checker)
+    const match = filter(cfg[container], checker)
     if (match.length > 1) fatal('One or more %s shared the same \'%s\'', container, dupChecks.join(', '), { code: 'BAJOMQTT_CONNECTION_NOT_UNIQUE' })
   })
-  /*
-  each(dupChecks, item => {
-    const items = map(options[container], item)
-    const uItems = uniq(items)
-    if (items.length !== uItems.length) fatal('One or more %s shared the same \'%s\'', container, item, { code: 'BAJOMQTT_CONNECTION_NOT_UNIQUE' })
-  })
-  */
-  await runHook(`${name}:${camelCase(`after build ${container}`)}`)
-  return options[container]
+  await runHook(`${plugin}:${camelCase(`after build ${container}`)}`)
+  return cfg[container]
 }
 
 export default buildCollections

package/boot/helper/each-plugins.js

@@ -1,8 +1,50 @@
-import { camelCase, isString, omit, isPlainObject, slice } from 'lodash-es'
+import { camelCase, isString, omit, trim } from 'lodash-es'
 import fastGlob from 'fast-glob'
 import path from 'path'
 import omittedPluginKeys from '../lib/omitted-plugin-keys.js'
 
+async function _eachPlugins (handler, { key = 'name', glob, ns, useBajo } = {}) {
+  const { getConfig } = this.bajo.helper
+  const config = getConfig()
+  const result = {}
+  const plugins = [...config.plugins]
+  if (useBajo) plugins.unshift('bajo')
+  for (const pkg of plugins) {
+    const plugin = camelCase(pkg)
+    let cfg = getConfig(plugin, { full: true })
+    const { alias, dependencies } = cfg
+    const dir = cfg.dir.pkg
+    cfg = omit(cfg, omittedPluginKeys)
+    let r
+    if (glob) {
+      const base = `${dir}/${ns}`
+      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) {
+        pattern[i] = `${base}/${pattern[i]}`
+      }
+      const files = await fastGlob(pattern, opts)
+      for (const f of files) {
+        const resp = await handler.call(this, { plugin, pkg, cfg, alias, file: f, dir: base, dependencies })
+        if (resp === false) break
+        else if (resp === undefined) continue
+        else {
+          result[plugin] = result[plugin] ?? {}
+          result[plugin][f] = resp
+        }
+      }
+    } else {
+      r = await handler.call(this, { plugin, pkg, cfg, dir, alias, dependencies })
+      if (r === false) break
+      else if (r === undefined) continue
+      else result[plugin] = r
+    }
+  }
+  return result
+}
+
 /**
  * @module helper/eachPlugins
  */
@@ -36,59 +78,27 @@ import omittedPluginKeys from '../lib/omitted-plugin-keys.js'
  * })
  */
 
-async function eachPlugins (handler, { key = 'name', glob, ns } = {}) {
+async function eachPlugins (handler, options = {}) {
   const { getConfig, getPluginName } = this.bajo.helper
-  const config = getConfig()
-  const result = {}
+  let { key = 'name', glob, ns, extend, extendHandler, useBajo } = options
+  if (!extendHandler) extendHandler = handler
   ns = ns ?? getPluginName(4)
-  for (const pkg of config.plugins) {
-    const plugin = camelCase(pkg)
-    let cfg = getConfig(plugin, { full: true })
-    const { alias, dir, dependencies } = cfg
-    cfg = omit(cfg, omittedPluginKeys)
-    let r
-    if (glob) {
-      const base = `${dir}/${ns}`
-      let pattern
-      let opts
-      if (isPlainObject(glob) && glob.pattern) pattern = glob.pattern
-      else {
-        if (isString(glob)) pattern = [glob]
-        for (const i in pattern) {
-          pattern[i] = `${base}/${pattern[i]}`
-        }
-      }
-      const files = await fastGlob(pattern, opts)
-      for (const f of files) {
-        const rel = f.replace(base, '')
-        const b = path.basename(rel, path.extname(rel))
-        const relDir = path.dirname(rel)
-        const relDirBase = `${relDir}/${b}`
-        const relName = slice(relDirBase.split('/'), 2).join('/')
-        const fileInfo = {
-          rel,
-          relDir,
-          relDirBase,
-          base: b,
-          name: camelCase(`${relName}`),
-          nameWithPlugin: camelCase(`${plugin} ${relName}`)
-        }
-        const resp = await handler.call(this, { plugin, pkg, cfg, alias, file: f, dir: base, dependencies, fileInfo })
-        if (resp === false) break
-        else if (resp === undefined) continue
-        else {
-          result[plugin] = result[plugin] ?? {}
-          result[plugin][f] = resp
-        }
+  const result = await _eachPlugins.call(this, handler, { key, glob, ns, useBajo })
+  if (extend && isString(glob)) {
+    let nsExtend = ns
+    if (isString(extend)) nsExtend += '/' + trim(extend, '/')
+    const cfg = getConfig('app', { full: true })
+    const ext = `${cfg.dir.pkg}/${nsExtend}/extend/*`
+    const exts = await fastGlob(ext, { onlyDirectories: true })
+    for (const e of exts) {
+      const plugin = path.basename(e)
+      const files = await fastGlob(`${e}/${glob}`)
+      for (const file of files) {
+        await extendHandler.call(this, { file, plugin, dir: e })
       }
-    } else {
-      r = await handler.call(this, { plugin, pkg, cfg, dir, alias, dependencies })
-      if (r === false) break
-      else if (r === undefined) continue
-      else result[plugin] = r
     }
   }
-  return result
+  return result // TODO: merge with extender
 }
 
 export default eachPlugins