bajo 0.3.1 → 0.3.3

package/boot/attach-helper.js

@@ -7,6 +7,7 @@ import dayjs from './lib/dayjs.js'
 import fs from 'fs-extra'
 import fastGlob from 'fast-glob'
 import { sprintf } from 'sprintf-js'
+import outmatch from 'outmatch'
 
 export default async function () {
   this.bajo.helper = await buildHelper.call(this, `${currentLoc(import.meta).dir}/helper`)
@@ -27,6 +28,7 @@ export default async function () {
   this.bajo.helper.fs = fs
   this.bajo.helper.fastGlob = fastGlob
   this.bajo.helper.sprintf = sprintf
+  this.bajo.helper.outmatch = outmatch
   // last cleanup
   this.bajo.helper.freeze(this.bajo.helper, true)
   if (!fs.existsSync(this.bajo.config.dir.data)) {

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/parse-object.js

@@ -1,4 +1,4 @@
-import { isPlainObject, isArray, isNumber, set } from 'lodash-es'
+import { isPlainObject, isArray, isNumber, set, cloneDeep } from 'lodash-es'
 import dotenvParseVariables from 'dotenv-parse-variables'
 import ms from 'ms'
 import dayjs from '../lib/dayjs.js'
@@ -16,7 +16,8 @@ function parseDt (val) {
   return dt.toDate()
 }
 
-function parseObject (obj, silent = true, parseValue = false) {
+function parseObject (input, silent = true, parseValue = false) {
+  const obj = cloneDeep(input)
   const keys = Object.keys(obj)
   keys.forEach(k => {
     const v = obj[k]

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/build-config.js

@@ -1,6 +1,5 @@
-import { camelCase, pick, isString, omit, pull, each } from 'lodash-es'
+import { camelCase, pick, isString, omit } from 'lodash-es'
 import fs from 'fs-extra'
-import lockfile from 'proper-lockfile'
 import omittedPluginKeys from '../lib/omitted-plugin-keys.js'
 import titleize from '../helper/titleize.js'
 
@@ -24,7 +23,7 @@ export async function readAllConfigs (base, name) {
   return cfg
 }
 
-async function runner (pkg, { singles, argv, env }) {
+async function runner (pkg, { argv, env }) {
   const { log, getConfig, getModuleDir, readConfig, error, readJson, defaultsDeep } = this.bajo.helper
   const config = getConfig()
   const name = camelCase(pkg)
@@ -53,29 +52,16 @@ async function runner (pkg, { singles, argv, env }) {
   cfg = defaultsDeep({}, envArgv ?? {}, cfg ?? {})
   cfg.dependencies = cfg.dependencies ?? []
   if (isString(cfg.dependencies)) cfg.dependencies = [cfg.dependencies]
-  if (cfg.single) {
-    const lockfileDir = `${config.dir.tmp}/lock`
-    const lockfilePath = `${lockfileDir}/${name}.lock`
-    fs.ensureDirSync(lockfileDir)
-    const file = `${dir}/package.json`
-    try {
-      await lockfile.lock(file, { lockfilePath })
-    } catch (err) {
-      singles.push(pkg)
-    }
-  }
   if (!this[name]) this[name] = {}
   this[name].config = cfg
 }
 
-async function buildConfig ({ singles, argv, env }) {
+async function buildConfig ({ argv, env }) {
   const { log, freeze } = this.bajo.helper
   log.debug('Read configurations')
   for (const pkg of this.bajo.config.plugins) {
-    await runner.call(this, pkg, { singles, argv, env })
+    await runner.call(this, pkg, { argv, env })
   }
-  pull(this.bajo.config.plugins, ...singles)
-  each(singles, s => delete this[camelCase(s)])
   freeze(this.bajo.config)
 }
 

package/boot/plugins/index.js

@@ -11,17 +11,16 @@ import parseArgsArgv from '../lib/parse-args-argv.js'
 import parseEnv from '../lib/parse-env.js'
 
 async function bootBajos () {
-  const singles = []
   const { argv } = await parseArgsArgv({ useParser: true }) ?? {}
   const env = parseEnv() ?? {}
   await collectConfigHandlers.call(this)
-  await buildConfig.call(this, { singles, argv, env })
+  await buildConfig.call(this, { argv, env })
   await extendConfig.call(this)
   await checkClash.call(this)
   await checkDependency.call(this)
   await attachHelper.call(this)
   await collectHooks.call(this)
-  await run.call(this, { singles })
+  await run.call(this)
   await collectExitHandlers.call(this)
 }
 

package/boot/plugins/run.js

@@ -1,6 +1,6 @@
 import { set, get, camelCase, upperFirst, map } from 'lodash-es'
 
-async function run ({ singles }) {
+async function run () {
   const { runHook, log, eachPlugins, importModule, freeze, getConfig, print } = this.bajo.helper
   const config = getConfig()
   const methods = ['init']
@@ -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)
@@ -23,9 +22,6 @@ async function run ({ singles }) {
     await runHook(`bajo:${camelCase(`after ${f} all plugins`)}`)
   }
   log.debug('Loaded plugins: %s', map(config.plugins, b => camelCase(b)).join(', '))
-  if (singles.length > 0) {
-    log.warn('Unloaded \'single\' plugins: %s', map(singles, s => camelCase(s)).join(', '))
-  }
 }
 
 export default run

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {
@@ -43,7 +43,6 @@
     "omit-deep": "^0.3.0",
     "ora": "^8.0.1",
     "outmatch": "^0.7.0",
-    "proper-lockfile": "^4.1.2",
     "semver": "^7.5.1",
     "sprintf-js": "^1.1.2",
     "yargs": "^17.7.2"