bajo 0.2.16 → 0.2.18

package/boot/helper/build-collections.js

@@ -1,8 +1,9 @@
-import { filter, isArray, each, pullAt, camelCase } from 'lodash-es'
+import { filter, isArray, each, pullAt, camelCase, has, find, set } from 'lodash-es'
 
 async function buildCollections (options = {}) {
-  const { getConfig, getPluginName, fatal, runHook } = this.bajo.helper
-  let { plugin, handler, dupChecks = [], container = 'connections' } = options
+  const { getConfig, getPluginName, fatal, runHook, error } = this.bajo.helper
+  let { plugin, handler, dupChecks = [], container = 'connections', useDefaultName } = options
+  useDefaultName = useDefaultName ?? true
   if (!plugin) plugin = getPluginName(4)
   const cfg = getConfig(plugin, { full: true })
   if (!cfg[container]) return []
@@ -12,6 +13,12 @@ async function buildCollections (options = {}) {
   const deleted = []
   for (const index in cfg[container]) {
     const item = cfg[container][index]
+    if (useDefaultName) {
+      if (!has(item, 'name')) {
+        if (find(cfg[container], { 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
     else if (result === false) deleted.push(index)
@@ -20,12 +27,11 @@ async function buildCollections (options = {}) {
 
   // check for duplicity
   each(cfg[container], c => {
-    const checker = {}
     each(dupChecks, d => {
-      checker[d] = c[d]
+      const checker = set({}, d, c[d])
+      const match = filter(cfg[container], checker)
+      if (match.length > 1) fatal('One or more %s shared the same \'%s\'', container, dupChecks.join(', '))
     })
-    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' })
   })
   await runHook(`${plugin}:${camelCase(`after build ${container}`)}`)
   return cfg[container]

package/boot/helper/each-plugins.js

@@ -27,6 +27,7 @@ async function _eachPlugins (handler, { key = 'name', glob, ns, useBajo } = {})
       }
       const files = await fastGlob(pattern, opts)
       for (const f of files) {
+        if (path.basename(f)[0] === '_') continue
         const resp = await handler.call(this, { plugin, pkg, cfg, alias, file: f, dir: base, dependencies })
         if (resp === false) break
         else if (resp === undefined) continue

package/boot/helper/error.js

@@ -42,7 +42,8 @@ function error (msg = 'Internal server error', ...args) {
   }
   if (!ns) ns = getPluginName.call(this, 3)
   const orgMsg = msg
-  const message = print.__(msg, ...args, { ns })
+  args.push({ ns })
+  const message = print.__(msg, ...args)
   let err
   if (isPlainObject(payload) && payload.class) err = payload.class(message)
   else err = Error(message)

package/boot/helper/fatal.js

@@ -1,10 +1,11 @@
-import error from './error.js'
 import getPluginName from './get-plugin-name.js'
 
 function fatal (...args) {
+  const { error } = this.bajo.helper
   const ns = getPluginName.call(this, 3)
   args.push({ ns })
-  const err = error(...args)
+  const [msg, ...params] = args
+  const err = error(msg, ...params)
   console.error(err)
   process.exit(1)
 }

package/boot/helper/import-module.js

@@ -3,15 +3,17 @@ import { isFunction, isPlainObject } from 'lodash-es'
 import error from './error.js'
 import fs from 'fs-extra'
 
-async function load (file, asDefaultImport = true) {
-  const imported = await import(resolvePath(file, true))
+async function load (file, asDefaultImport = true, noCache = false) {
+  file = resolvePath(file, true)
+  if (noCache) file += `?_=${Date.now()}`
+  const imported = await import(file)
   if (asDefaultImport) return imported.default
   return imported
 }
 
-async function importModule (file, { asDefaultImport, asHandler } = {}) {
+async function importModule (file, { asDefaultImport, asHandler, noCache } = {}) {
   if (!fs.existsSync(file)) return
-  let mod = await load(file, asDefaultImport)
+  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)

package/boot/helper/import-pkg.js

@@ -29,7 +29,7 @@ import fs from 'fs-extra'
 
 async function importPkg (...pkg) {
   const result = {}
-  let opts = { returnDefault: true, thrownNotFound: false }
+  let opts = { returnDefault: true, thrownNotFound: false, noCache: false }
   if (isPlainObject(last(pkg))) {
     opts = defaultsDeep(pkg.pop(), opts)
   }
@@ -52,6 +52,7 @@ async function importPkg (...pkg) {
       if (fs.existsSync(`${mainFileOrg}/index.js`)) mainFile += '/index.js'
       else mainFile += '.js'
     }
+    if (opts.noCache) mainFile += `?_=${Date.now()}`
     let mod = await import(mainFile)
     if (opts.returnDefault && has(mod, 'default')) {
       mod = mod.default

package/boot/helper/parse-object.js

@@ -1,4 +1,5 @@
-import { isPlainObject, isArray, isNumber } from 'lodash-es'
+import { isPlainObject, isArray, isNumber, set } from 'lodash-es'
+import dotenvParseVariables from 'dotenv-parse-variables'
 import ms from 'ms'
 import dayjs from '../lib/dayjs.js'
 import isSet from './is-set.js'
@@ -13,7 +14,7 @@ function parseDt (val) {
   return dt.toDate()
 }
 
-function parseObject (obj, silent = true) {
+function parseObject (obj, silent = true, parseValue = false) {
   const keys = Object.keys(obj)
   keys.forEach(k => {
     const v = obj[k]
@@ -21,9 +22,11 @@ function parseObject (obj, silent = true) {
     else if (isArray(v)) {
       v.forEach((i, idx) => {
         if (isPlainObject(i)) obj[k][idx] = parseObject(i)
+        else if (parseValue) obj[k][idx] = dotenvParseVariables(set({}, 'item', obj[k][idx]), { assignToProcessEnv: false }).item
       })
     } else if (isSet(v)) {
       try {
+        if (parseValue) obj[k] = dotenvParseVariables(set({}, 'item', v), { assignToProcessEnv: false }).item
         if (k.slice(-3) === 'Dur') obj[k] = parseDur(v)
         if (k.slice(-2) === 'Dt') obj[k] = parseDt(v)
       } catch (err) {

package/boot/helper/pick.js

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

package/boot/helper/round.js

@@ -0,0 +1,6 @@
+function round (val, scale = 0) {
+  scale = scale <= 0 ? 1 : 10 ** scale
+  return Math.round(val * scale) / scale
+}
+
+export default round

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {
@@ -40,9 +40,8 @@
     "lodash-es": "^4.17.21",
     "ms": "^2.1.3",
     "nanoid": "^4.0.2",
-    "node-fetch": "^3.3.1",
     "omit-deep": "^0.3.0",
-    "ora": "^6.3.1",
+    "ora": "^8.0.1",
     "outmatch": "^0.7.0",
     "proper-lockfile": "^4.1.2",
     "semver": "^7.5.1",