bajo 0.3.5 → 0.3.7

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

@@ -1,15 +1,18 @@
-import { isEmpty } from 'lodash-es'
+import { isEmpty, find } from 'lodash-es'
 
-function breakNsPath (item = '') {
-  const { error, getPlugin } = this.bajo.helper
+function breakNsPath (item = '', defaultNs = 'bajo') {
+  const { error } = this.bajo.helper
   let [ns, ...path] = item.split(':')
   path = path.join(':')
   if (isEmpty(path)) {
     path = ns
-    ns = null
+    ns = defaultNs
+  }
+  if (ns.length === 1) return [ns, path].join(':') // windows fs
+  if (!this[ns]) {
+    const ref = find(this.bajo.pluginRefs ?? [], { alias: ns })
+    if (ref) ns = ref.plugin
   }
-  // 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]
 }

package/boot/helper/build-collections.js

@@ -1,7 +1,7 @@
 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
+  const { getConfig, getPluginName, fatal, runHook, error, join } = this.bajo.helper
   let { plugin, handler, dupChecks = [], container = 'connections', useDefaultName } = options
   useDefaultName = useDefaultName ?? true
   if (!plugin) plugin = getPluginName(4)
@@ -32,7 +32,7 @@ async function buildCollections (options = {}) {
     each(dupChecks, d => {
       const checker = set({}, d, c[d])
       const match = filter(data, checker)
-      if (match.length > 1) fatal('One or more %s shared the same \'%s\'', container, dupChecks.join(', '))
+      if (match.length > 1) fatal('One or more %s shared the same \'%s\'', container, join(dupChecks))
     })
   })
   await runHook(`${plugin}:${camelCase(`after build ${container}`)}`)

package/boot/helper/get-plugin-file.js

@@ -1,8 +1,10 @@
 import { get } from 'lodash-es'
+import breakNsPath from './break-ns-path.js'
 
 function getPluginFile (file) {
+  if (!get(this, 'bajo.helper')) return file
   if (file.includes(':')) {
-    const [plugin, path] = file.split(':')
+    const [plugin, path] = breakNsPath.call(this, file)
     if (plugin !== 'file' && this && this[plugin] && plugin.length > 1) {
       const dir = get(this[plugin], 'config.dir.pkg')
       file = `${dir}${path}`

package/boot/helper/get-plugin.js

@@ -6,7 +6,7 @@ function getPlugin (name) {
     // alias?
     const ref = find(this.bajo.pluginRefs ?? [], { alias: name })
     if (!ref) throw error('\'%s\' is not loaded', name)
-    name = ref.name
+    name = ref.plugin
   }
   return this[name]
 }

package/boot/helper/import-pkg.js

@@ -4,6 +4,7 @@ import getModuleDir from './get-module-dir.js'
 import resolvePath from './resolve-path.js'
 import readJson from './read-json.js'
 import defaultsDeep from './defaults-deep.js'
+import breakNsPath from './break-ns-path.js'
 import path from 'path'
 import fs from 'fs-extra'
 
@@ -14,11 +15,7 @@ async function importPkg (...pkgs) {
     opts = defaultsDeep(pkgs.pop(), opts)
   }
   for (const pkg of pkgs) {
-    let [plugin, name] = pkg.split(':').map(item => item.trim())
-    if (!name) {
-      name = plugin
-      plugin = 'bajo'
-    }
+    const [plugin, name] = breakNsPath.call(this, pkg)
     const dir = getModuleDir.call(this, name, plugin)
     const p = readJson(`${dir}/package.json`, opts.thrownNotFound)
     const mainFileOrg = dir + '/' + (p.main ?? get(p, 'exports.default', 'index.js'))

package/boot/helper/join.js

@@ -0,0 +1,11 @@
+import { isPlainObject } from 'lodash-es'
+import isSet from './is-set.js'
+
+const join = (array, sep) => {
+  if (isSet(sep) && !isPlainObject(sep)) return array.join(sep)
+  const { separator = ', ', joiner = 'and' } = sep ?? {}
+  const last = (array.pop() ?? '').trim()
+  return array.map(a => (a + '').trim()).join(separator) + ` ${joiner} ${last}`
+}
+
+export default join

package/boot/lib/logger.js

@@ -58,7 +58,6 @@ class Log {
         text = JSON.stringify(json)
       } else {
         text = `[${dayjs(dt).utc(true).format(this.format)}] ${upperFirst(level)}: ${msg}`
-        // if (!isEmpty(data)) text += '\n  ' + (pretty.render(data, prettyOpts).split('\n').join('\n  '))
         if (!isEmpty(data)) text += '\n' + JSON.stringify(data)
       }
       console.log(text)

package/boot/lib/shim.js

@@ -1,8 +1,7 @@
-// taken from: https://vanillajstoolkit.com/polyfills/stringreplaceall/
-
 function shim () {
+  // taken from: https://vanillajstoolkit.com/polyfills/stringreplaceall/
   if (!String.prototype.replaceAll) {
-    String.prototype.replaceAll = function(str, newStr){
+    String.prototype.replaceAll = function(str, newStr) { // eslint-disable-line
       if (Object.prototype.toString.call(str).toLowerCase() === '[object regexp]') {
         return this.replace(str, newStr)
       }

package/boot/plugins/check-dependency.js

@@ -2,7 +2,7 @@ import { reduce, map, trim, keys, intersection, each, camelCase, get } from 'lod
 import semver from 'semver'
 
 async function runner ({ plugin, pkg, dependencies }) {
-  const { log, getConfig, error } = this.bajo.helper
+  const { log, getConfig, error, join } = this.bajo.helper
   log.trace('Checking dependencies: %s', plugin)
   const config = getConfig()
   const odep = reduce(dependencies, (o, k) => {
@@ -13,7 +13,7 @@ async function runner ({ plugin, pkg, dependencies }) {
   const deps = keys(odep)
   if (deps.length > 0) {
     if (intersection(config.plugins, deps).length !== deps.length) {
-      throw error('Dependency for \'%s\' unfulfilled: %s', pkg, deps.join(', '), { code: 'BAJO_DEPENDENCY' })
+      throw error('Dependency for \'%s\' unfulfilled: %s', pkg, join(deps), { code: 'BAJO_DEPENDENCY' })
     }
     each(deps, d => {
       if (!odep[d]) return

package/boot/plugins/collect-config-handlers.js

@@ -1,7 +1,7 @@
 import { isFunction, isPlainObject, map } from 'lodash-es'
 
 async function collectConfigHandlers (pkg) {
-  const { getModuleDir, importModule, log } = this.bajo.helper
+  const { getModuleDir, importModule, log, join } = this.bajo.helper
   for (const pkg of this.bajo.config.plugins) {
     let dir
     try {
@@ -16,7 +16,7 @@ async function collectConfigHandlers (pkg) {
     this.bajo.configHandlers.concat(mod)
   }
   const exts = map(this.bajo.configHandlers, 'ext')
-  log.trace('Config handlers: %s', exts.join(', '))
+  log.trace('Config handlers: %s', join(exts))
 }
 
 export default collectConfigHandlers

package/boot/plugins/collect-exit-handlers.js

@@ -1,7 +1,7 @@
 import {} from 'lodash-es'
 
 async function collectExitHandlers () {
-  const { importModule, log, eachPlugins, getConfig, print } = this.bajo.helper
+  const { importModule, log, eachPlugins, getConfig, print, join } = this.bajo.helper
   const config = getConfig()
   if (!config.exitHandler) return
   this.bajo.exitHandler = this.bajo.exitHandler ?? {}
@@ -12,7 +12,7 @@ async function collectExitHandlers () {
     this.bajo.exitHandler[plugin] = mod
     names.push(plugin)
   })
-  log.trace('Exit handlers: %s', names.length === 0 ? print.__('none') : names.join(', '))
+  log.trace('Exit handlers: %s', names.length === 0 ? print.__('none') : join(names))
 }
 
 export default collectExitHandlers

package/boot/plugins/run.js

@@ -1,7 +1,7 @@
 import { set, get, camelCase, upperFirst, map } from 'lodash-es'
 
 async function run () {
-  const { runHook, log, eachPlugins, importModule, freeze, getConfig, print } = this.bajo.helper
+  const { runHook, log, eachPlugins, importModule, freeze, getConfig, print, join } = this.bajo.helper
   const config = getConfig()
   const methods = ['init']
   if (!get(config, 'tool')) methods.push('start')
@@ -20,7 +20,7 @@ async function run () {
     })
     await runHook(`bajo:${camelCase(`after ${f} all plugins`)}`)
   }
-  log.debug('Loaded plugins: %s', map(config.plugins, b => camelCase(b)).join(', '))
+  log.debug('Loaded plugins: %s', join(map(config.plugins, b => camelCase(b))))
 }
 
 export default run

package/package.json

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