bajo 0.3.1 → 0.3.2

package/boot/helper/build-collections.js

@@ -1,4 +1,4 @@
-import { filter, isArray, each, pullAt, camelCase, has, find, set, cloneDeep } from 'lodash-es'
+import { filter, isArray, each, pullAt, camelCase, has, find, set, get, cloneDeep } from 'lodash-es'
 
 async function buildCollections (options = {}) {
   const { getConfig, getPluginName, fatal, runHook, error } = this.bajo.helper
@@ -7,36 +7,37 @@ async function buildCollections (options = {}) {
   if (!plugin) plugin = getPluginName(4)
   const config = getConfig()
   const cfg = getConfig(plugin, { full: true })
-  if (!cfg[container]) return []
-  if (!isArray(cfg[container])) cfg[container] = [cfg[container]]
-  cfg[container] = cfg[container] ?? []
+  let data = get(cfg, container)
+  if (!data) return []
+  if (!isArray(data)) data = [data]
   await runHook(`${plugin}:${camelCase(`before build ${container}`)}`)
   const deleted = []
-  for (const index in cfg[container]) {
-    const item = cfg[container][index]
+  for (const index in data) {
+    const item = data[index]
     if (useDefaultName) {
       if (!has(item, 'name')) {
-        if (find(cfg[container], { name: 'default' })) throw error('Connection \'default\' already exists')
+        if (find(data, { name: 'default' })) throw error('Connection \'default\' already exists')
         else item.name = 'default'
       }
     }
     const result = await handler.call(this, { item, index, cfg })
-    if (result) cfg[container][index] = result
+    if (result) data[index] = result
     else if (result === false) deleted.push(index)
     if (config.tool && item.skipOnTool && !deleted.includes(index)) deleted.push(index)
   }
-  if (deleted.length > 0) pullAt(cfg[container], deleted)
+  if (deleted.length > 0) pullAt(data, deleted)
 
   // check for duplicity
-  each(cfg[container], c => {
+  each(data, c => {
     each(dupChecks, d => {
       const checker = set({}, d, c[d])
-      const match = filter(cfg[container], checker)
+      const match = filter(data, checker)
       if (match.length > 1) fatal('One or more %s shared the same \'%s\'', container, dupChecks.join(', '))
     })
   })
   await runHook(`${plugin}:${camelCase(`after build ${container}`)}`)
-  return cloneDeep(cfg[container])
+  set(cfg, container, data)
+  return cloneDeep(data)
 }
 
 export default buildCollections

package/boot/helper/pick.js

@@ -2,11 +2,11 @@ import isSet from './is-set.js'
 
 function pick (obj, items, excludeUnset) {
   const result = {}
-  items.forEach(item => {
+  for (const item of items) {
     const [k, nk] = item.split(':')
-    if (excludeUnset && !isSet(obj[k])) return undefined
+    if (excludeUnset && !isSet(obj[k])) continue
     result[nk ?? k] = obj[k]
-  })
+  }
   return result
 }
 

package/boot/helper/start-plugin.js

@@ -1,8 +1,8 @@
-async function startPlugin (name, opts) {
+async function startPlugin (name, ...args) {
   const { getConfig, importModule } = this.bajo.helper
   const cfg = getConfig(name, { full: true })
   const start = await importModule(`${cfg.dir.pkg}/bajo/start.js`)
-  await start.call(this, opts)
+  await start.call(this, ...args)
 }
 
 export default startPlugin

package/boot/plugins/run.js

@@ -13,8 +13,7 @@ async function run ({ singles }) {
       if (mod) {
         log.debug('%s: %s', print.__(upperFirst(f)), plugin)
         await runHook(`bajo:${camelCase(`before ${f} ${plugin}`)}`)
-        const params = f === 'start' ? ['all', true] : []
-        await mod.call(this, ...params)
+        await mod.call(this)
         await runHook(`bajo:${camelCase(`after ${f} ${plugin}`)}`)
       }
       if (f === 'init') freeze(this[plugin].config)

package/package.json

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