bajo 1.1.2 → 1.1.4

package/bajo/intl/en-US.json

@@ -131,7 +131,7 @@
   "file": "File",
   "applet": "Applet",
   "unsupported%s%s": "Unsupported %s '%s'",
-  "error%": "Error: %s",
+  "error%s": "Error: %s",
   "savedAs%%": "%s saved as '%s'",
   "loaded%s": "Loaded %s",
   "production": "production",
@@ -154,5 +154,7 @@
   "thankYou": "Thank you!",
   "adminArea": "Admin Area",
   "instanceCreatedOnConn%s%s": "Instance '%s' created on connection '%s'",
-  "fileNotModuleHandler%s": "File '%s' is NOT a module handler"
+  "fileNotModuleHandler%s": "File '%s' is NOT a module handler",
+  "error%s%s%s": "%s error (%s): %s",
+  "invalid%s%s": "Invalid %s (%s)"
 }

package/bajo/intl/id.json

@@ -131,7 +131,7 @@
   "file": "Berkas",
   "applet": "Applet",
   "unsupported%s%s": "%s '%s' tidak didukung",
-  "error%": "Kesalahan: %s",
+  "error%s": "Kesalahan: %s",
   "savedAs%%": "%s disimpan sbg '%s'",
   "loaded%s": "%s termuat",
   "production": "produksi",
@@ -154,5 +154,7 @@
   "thankYou": "Terima kasih!",
   "adminArea": "Area Admin",
   "instanceCreatedOnConn%s%s": "Instance '%s' telah dibuat pada koneksi '%s'",
-  "fileNotModuleHandler%s": "Berkas '%s' BUKAN merupakan module handler"
+  "fileNotModuleHandler%s": "Berkas '%s' BUKAN merupakan module handler",
+  "error%s%s%s": "Kesalahan %s (%s): %s",
+  "invalid%s%s": "%s tidak valid (%s)"
 }

package/boot/class/app.js

@@ -60,7 +60,7 @@ class App {
     // boot complete
     const elapsed = new Date() - bajo.runAt
     bajo.log.info('bootCompleted%s', bajo.secToHms(elapsed, true))
-    await bajo.runHook('bajo:bootComplete')
+    await bajo.runHook('bajo:afterBootComplete')
     if (bajo.applet) await runAsApplet.call(bajo)
   }
 }

package/boot/class/bajo-core/build-config.js

@@ -42,8 +42,10 @@ export async function buildBaseConfig () {
   if (!get(this, 'dir.data')) set(this, 'dir.data', `${this.dir.base}/data`)
   this.dir.data = this.resolvePath(this.dir.data)
   if (!fs.existsSync(this.dir.data)) {
-    this.log.warn('ddirNotExists%s', this.dir.data)
+    console.log('Data directory (%s) doesn\'t exist yet', this.dir.data)
+    process.exit(1)
   }
+  fs.ensureDirSync(`${this.dir.data}/config`)
   if (!this.dir.tmp) {
     this.dir.tmp = `${this.resolvePath(os.tmpdir())}/${this.name}`
     fs.ensureDirSync(this.dir.tmp)
@@ -71,4 +73,5 @@ export async function buildExtConfig () {
   this.initPrint()
   this.initLog()
   this.log.debug('configHandlers%s', this.join(exts))
+  this.config = this.parseObject(this.config, { parseValue: true })
 }

package/boot/class/bajo-core/build-plugins.js

@@ -19,8 +19,15 @@ async function buildPlugins () {
   this.pluginPkgs.push(this.mainNs)
   for (const pkg of this.pluginPkgs) {
     const ns = camelCase(pkg)
-    const dir = ns === this.mainNs ? (`${this.dir.base}/${this.mainNs}`) : this.getModuleDir(pkg)
-    if (ns !== this.mainNs && !fs.existsSync(`${dir}/plugin`)) throw new Error(`Package '${pkg}' isn't a valid Bajo package`)
+    let dir
+    if (ns === 'main') {
+      dir = `${this.dir.base}/${this.mainNs}`
+      fs.ensureDirSync(dir)
+      fs.ensureDirSync(`${dir}/plugin`)
+    } else {
+      dir = this.getModuleDir(pkg)
+      if (!fs.existsSync(`${dir}/plugin`)) throw new Error(`Package '${pkg}' isn't a valid Bajo package`)
+    }
     let plugin
     const factory = `${dir}/plugin/factory.js`
     if (fs.existsSync(factory)) {

package/boot/class/bajo-core.js

@@ -28,7 +28,7 @@ const {
   isFunction, words, upperFirst, map, concat, uniq, forOwn, padStart,
   trim, filter, isEmpty, orderBy, pullAt, find, camelCase, isNumber,
   cloneDeep, isPlainObject, isArray, isString, set, omit, keys, indexOf,
-  last, get, has, values, dropRight, mergeWith
+  last, get, has, values, dropRight, pick, mergeWith
 } = lodash
 
 class BajoCore extends Plugin {
@@ -113,14 +113,14 @@ class BajoCore extends Plugin {
 
   breakNsPath = (item = '', defaultNs = 'bajo', checkNs = true) => {
     let [ns, ...path] = item.split(':')
+    const fullNs = ns
     let subNs
     let subSubNs
     path = path.join(':')
-    if (path.startsWith('//')) return { ns: undefined, path: item } // for: http:// etc
-    if (isEmpty(path)) {
-      path = ns
-      ns = defaultNs
+    if (path.startsWith('//')) {
+      return { path: item } // for: http:// etc
     }
+
     [ns, subNs, subSubNs] = ns.split('.')
     if (checkNs) {
       if (!this.app[ns]) {
@@ -133,7 +133,7 @@ class BajoCore extends Plugin {
     let qs
     [path, qs] = path.split('?')
     qs = querystring.parse(qs) ?? {}
-    return { ns, path, subNs, subSubNs, qs, fullPath }
+    return { ns, path, subNs, subSubNs, qs, fullPath, fullNs }
   }
 
   buildCollections = async (options = {}) => {
@@ -163,14 +163,11 @@ class BajoCore extends Plugin {
     if (deleted.length > 0) pullAt(items, deleted)
 
     // check for duplicity
-    for (const c of items) {
-      for (const d of dupChecks) {
-        if (isFunction(d)) await d.call(this.app[ns], c, items)
-        else {
-          const checker = set({}, d, c[d])
-          const match = filter(items, checker)
-          if (match.length > 1) this.app[ns].fatal('oneOrMoreSharedTheSame%s%s', container, this.join(dupChecks.filter(i => !isFunction(i))))
-        }
+    if (dupChecks.length > 0) {
+      const checkers = []
+      for (const c of items) {
+        const checker = JSON.stringify(pick(c, dupChecks))
+        if (checkers.includes(checker)) this.app[ns].fatal('oneOrMoreSharedTheSame%s%s', container, this.join(dupChecks.filter(i => !isFunction(i))))
       }
     }
     await this.runHook(`${ns}:${camelCase('afterBuildCollection')}`, container)
@@ -192,8 +189,12 @@ class BajoCore extends Plugin {
         const applet = find(bajo.applets, a => (a.ns === ns || a.alias === ns))
         if (applet) result = await bajo.runApplet(applet, path, ...args)
       } else {
-        const method = bajo.getMethod(item)
-        if (method) result = await method(...args)
+        const [ns, method, ...params] = item.split(':')
+        const fn = bajo.getMethod(`${ns}:${method}`)
+        if (fn) {
+          if (params.length > 0) args.unshift(...params)
+          result = await fn(...args)
+        }
       }
     } else if (isFunction(item)) {
       result = await item.call(scope, ...args)
@@ -691,7 +692,6 @@ class BajoCore extends Plugin {
     if (isEmpty(fns)) return
     fns = orderBy(fns, ['level'])
     const results = []
-    const removed = []
     for (const i in fns) {
       const fn = fns[i]
       const scope = this.app[fn.src]
@@ -700,11 +700,8 @@ class BajoCore extends Plugin {
         hook: hookName,
         resp: res
       })
-      if (path.startsWith('once')) removed.push(i)
       if (this.config.log.traceHook) scope.log.trace('hookExecuted%s', hookName)
     }
-    if (removed.length > 0) pullAt(this.app.bajo.hooks, removed)
-
     return results
   }
 

package/boot/class/bajo-plugin.js

@@ -13,7 +13,7 @@ class BajoPlugin extends Plugin {
   }
 
   loadConfig = async () => {
-    const { log, getModuleDir, readJson, defaultsDeep } = this.app.bajo
+    const { log, getModuleDir, readJson, defaultsDeep, parseObject } = this.app.bajo
     log.trace('- %s', this.name)
     const dir = this.name === this.app.bajo.mainNs ? (`${this.app.bajo.dir.base}/${this.app.bajo.mainNs}`) : getModuleDir(this.pkgName)
     let cfg = await readAllConfigs.call(this.app, `${dir}/plugin/config`)
@@ -46,7 +46,7 @@ class BajoPlugin extends Plugin {
     this.dependencies = this.dependencies ?? []
     const depFile = `${dir}/plugin/.dependencies`
     if (fs.existsSync(depFile)) this.dependencies = without(fs.readFileSync(depFile, 'utf8').split('\n').map(item => trim(item)), '')
-    this.config = omit(cfg, ['title', 'dependencies'])
+    this.config = parseObject(omit(cfg, ['title', 'dependencies']), { parseValue: true })
   }
 
   _onoff = async (item, ...args) => {

package/boot/class/log.js

@@ -5,6 +5,18 @@ import logLevels from '../lib/log-levels.js'
 
 const { isEmpty, without, merge, upperFirst } = lodash
 
+export function isIgnored (level) {
+  const { filter, isArray } = this.lib._
+  let ignore = this.app.bajo.config.log.ignore ?? []
+  if (!isArray(ignore)) ignore = [ignore]
+  const items = filter(ignore, i => {
+    const [ns, lvl] = i.split(':')
+    if (lvl) return ns === this.name && lvl === level
+    return ns === this.name
+  })
+  return items.length > 0
+}
+
 class Log {
   constructor (plugin) {
     this.plugin = plugin
@@ -23,6 +35,10 @@ class Log {
     return this.plugin.app[this.bajoLog] && this.plugin.app[this.bajoLog].logger
   }
 
+  isIgnored = level => {
+    return isIgnored.call(this.plugin, level)
+  }
+
   child = () => {
     if (this.isExtLogger()) return this.plugin.app[this.bajoLog].logger.child()
     return this.plugin.app
@@ -53,7 +69,7 @@ class Log {
         text = `[${dayjs(dt).utc(true).format(this.format)}] ${upperFirst(level)}: ${msg}`
         if (!isEmpty(data)) text += '\n' + JSON.stringify(data)
       }
-      console.log(text)
+      if (!this.isIgnored(level)) console.log(text)
     }
   }
 }

package/boot/class/plugin.js

@@ -3,6 +3,33 @@ import omittedPluginKeys from '../lib/omitted-plugin-keys.js'
 import Log from './log.js'
 import Print from './print.js'
 import BajoError from './error.js'
+import fastGlob from 'fast-glob'
+import { sprintf } from 'sprintf-js'
+import outmatch from 'outmatch'
+import dayjs from '../lib/dayjs.js'
+import fs from 'fs-extra'
+
+function outmatchNs (source, pattern) {
+  const { breakNsPath } = this.app.bajo
+  const [src, subSrc] = source.split(':')
+  if (!subSrc) return pattern === src
+  try {
+    const { fullNs, path } = breakNsPath(pattern)
+    const isMatch = outmatch(path)
+    return src === fullNs && isMatch(subSrc)
+  } catch (err) {
+    return false
+  }
+}
+
+const lib = {
+  _: lodash,
+  fs,
+  fastGlob,
+  sprintf,
+  outmatch,
+  dayjs
+}
 
 const { get, isEmpty, cloneDeep, omit, isPlainObject, camelCase } = lodash
 
@@ -12,7 +39,8 @@ class Plugin {
     this.name = camelCase(pkgName)
     this.app = app
     this.config = {}
-    this.lib = {}
+    this.lib = lib
+    this.lib.outmatchNs = outmatchNs.bind(this)
     this.exitHandler = undefined
   }
 

package/boot/lib/create-method.js

@@ -3,11 +3,12 @@ import path from 'path'
 import lodash from 'lodash'
 import resolvePath from './resolve-path.js'
 
-const { camelCase, isFunction, isPlainObject, forOwn } = lodash
+const { camelCase, isFunction } = lodash
 
 export default async function (dir, pkg = 'bajo') {
   dir = resolvePath(dir)
   const files = await fastGlob([`!${dir}/**/_*.{js,json}`, `${dir}/**/*.{js,json}`])
+  const me = this
   for (const f of files) {
     const ext = path.extname(f)
     const base = f.replace(dir, '').replace(ext, '')
@@ -16,13 +17,15 @@ export default async function (dir, pkg = 'bajo') {
     if (ext === '.json') mod = this.app.bajo.readJson(f)
     else mod = await this.app.bajo.importModule(f)
     if (isFunction(mod)) {
-      mod = mod.bind(this)
-    } else if (isPlainObject(mod)) {
-      if (!mod.exec) { // mod.exec offer unbind, nacked function people can bind to anything else later
-        forOwn(mod, (v, k) => {
-          if (isFunction(v)) mod[k] = v.bind(this)
-        })
-      }
+      const fn = mod.bind(this)
+      if (mod.constructor.name === 'AsyncFunction') {
+        mod = async (...args) => {
+          await me.app.bajo.runHook(`${me.name}.${name}:beforeExec`, ...args)
+          const result = await fn(...args)
+          await me.app.bajo.runHook(`${me.name}.${name}:afterExec`, result, ...args)
+          return result
+        }
+      } else mod = fn
     }
     this[name] = mod
   }

package/package.json

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