bajo 1.0.10 → 1.1.0

package/bajo/intl/en-US.json

@@ -148,5 +148,9 @@
   "or": "or",
   "none": "none",
   "isRequired%s": "'%s' is required",
-  "isDisabled%s": "'%s' is disabled"
+  "isDisabled%s": "'%s' is disabled",
+  "formSubmitted": "Form Submitted",
+  "formSubmittedInfo": "The form you entered has been successfully submitted and is stored securely in our system.",
+  "thankYou": "Thank you!",
+  "adminArea": "Admin Area"
 }

package/bajo/intl/id.json

@@ -148,5 +148,9 @@
   "or": "atau",
   "none": "kosong",
   "isRequired%s": "'%s' disyaratkan",
-  "isDisabled%s": "'%s' dimatikan"
+  "isDisabled%s": "'%s' dimatikan",
+  "formSubmitted": "Form Terkirim",
+  "formSubmittedInfo": "Form yang Anda masukkan telah sukses terkirim dan disimpan dengan aman di sistim kami.",
+  "thankYou": "Terima kasih!",
+  "adminArea": "Area Admin"
 }

package/boot/class/app.js

@@ -28,12 +28,12 @@ class App {
     this.cwd = cwd
   }
 
-  addPlugin (plugin) {
+  addPlugin = (plugin) => {
     if (this[plugin.name]) throw new Error(`Plugin '${plugin.name}' added already`)
     this[plugin.name] = plugin
   }
 
-  dump (...args) {
+  dump = (...args) => {
     const terminate = last(args) === true
     if (terminate) args.pop()
     for (const arg of args) {
@@ -43,7 +43,7 @@ class App {
     if (terminate) process.kill(process.pid, 'SIGINT')
   }
 
-  async boot () {
+  boot = async () => {
     // argv/args
     const { args, argv } = await parseArgsArgv.call(this.app) ?? {}
     this.argv = argv

package/boot/class/bajo-core/helper/boot-order.js

@@ -16,10 +16,10 @@ async function bootOrder () {
   for (let n of this.pluginPkgs) {
     n = map(n.split(':'), m => trim(m))[0]
     const dir = n === this.mainNs ? (`${this.dir.base}/${this.mainNs}`) : getModuleDir(n)
-    if (n !== this.mainNs && !fs.existsSync(`${dir}/bajo`)) throw this.error('packageNotFoundOrNotBajo%s', n)
+    if (n !== this.mainNs && !fs.existsSync(`${dir}/plugin`)) throw this.error('packageNotFoundOrNotBajo%s', n)
     norder[n] = NaN
     try {
-      norder[n] = Number(trim(await fs.readFile(`${dir}/bajo/.bootorder`, 'utf8')))
+      norder[n] = Number(trim(await fs.readFile(`${dir}/plugin/.bootorder`, 'utf8')))
     } catch (err) {}
   }
   const result = []

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

@@ -27,7 +27,7 @@ const defConfig = {
     lookupOrder: [],
     format: {
       emptyValue: '',
-      datetime: { dateStyle: 'medium', 'timeStyle': 'short' },
+      datetime: { dateStyle: 'medium', timeStyle: 'short' },
       date: { dateStyle: 'medium' },
       time: { timeStyle: 'short' },
       float: { maximumFractionDigits: 2 },

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

@@ -1,7 +1,7 @@
 import lodash from 'lodash'
 import fs from 'fs-extra'
 import getModuleDir from '../method/get-module-dir.js'
-import BajoPlugin from '../../bajo-plugin.js'
+import resolvePath from '../method/resolve-path.js'
 
 const { isString, filter, map, trim, without, uniq, camelCase, isEmpty } = lodash
 
@@ -12,13 +12,26 @@ async function buildPlugins () {
   if (fs.existsSync(pluginsFile)) {
     pluginPkgs = pluginPkgs.concat(filter(map(trim(fs.readFileSync(pluginsFile, 'utf8')).split('\n'), p => trim(p)), b => !isEmpty(b)))
   }
-  this.pluginPkgs = without(uniq(pluginPkgs), this.mainNs)
+  this.pluginPkgs = map(filter(without(uniq(pluginPkgs), this.mainNs), p => {
+    return p[0] !== '#'
+  }), p => {
+    return trim(p.split('#')[0])
+  })
   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}`) : getModuleDir.call(this, pkg)
-    if (ns !== this.mainNs && !fs.existsSync(`${dir}/${this.name}`)) throw new Error(`Package '${pkg}' isn't a valid Bajo package`)
-    const plugin = new BajoPlugin(pkg, this.app)
+    if (ns !== this.mainNs && !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)) {
+      const { default: builder } = await import(resolvePath(factory, true))
+      const FactoryClass = await builder.call(this, pkg)
+      plugin = new FactoryClass()
+      if (!(plugin instanceof this.lib.BajoPlugin)) throw new Error(`Plugin package '${pkg}' should be an instance of BajoPlugin`)
+    } else {
+      plugin = new this.lib.BajoPlugin(pkg, this.app)
+    }
     this.pluginNames.push(plugin.name)
     this.app.addPlugin(plugin)
   }

package/boot/class/bajo-core/method/is-valid-app.js

@@ -4,7 +4,7 @@ import resolvePath from './resolve-path.js'
 const isValidApp = (dir) => {
   if (!dir) dir = process.env.BAJOCWD
   dir = resolvePath(dir)
-  const hasMainDir = fs.existsSync(`${dir}/main/bajo`)
+  const hasMainDir = fs.existsSync(`${dir}/main/plugin`)
   const hasPackageJson = fs.existsSync(`${dir}/package.json`)
   return hasMainDir && hasPackageJson
 }

package/boot/class/bajo-core/method/is-valid-plugin.js

@@ -4,9 +4,9 @@ import resolvePath from './resolve-path.js'
 const isValidPlugin = (dir) => {
   if (!dir) dir = process.env.BAJOCWD
   dir = resolvePath(dir)
-  const hasBajoDir = fs.existsSync(`${dir}/bajo`)
+  const hasPluginDir = fs.existsSync(`${dir}/plugin`)
   const hasPackageJson = fs.existsSync(`${dir}/package.json`)
-  return hasBajoDir && hasPackageJson
+  return hasPluginDir && hasPackageJson
 }
 
 export default isValidPlugin

package/boot/class/bajo-core.js

@@ -1,4 +1,5 @@
 import Plugin from './plugin.js'
+import BajoPlugin from './bajo-plugin.js'
 import dayjs from '../lib/dayjs.js'
 import importModule from './bajo-core/method/import-module.js'
 import readJson from './bajo-core/method/read-json.js'
@@ -18,6 +19,7 @@ class BajoCore extends Plugin {
     this.runAt = new Date()
     this.mainNs = 'main'
     this.lib.dayjs = dayjs
+    this.lib.BajoPlugin = BajoPlugin
     this.applets = []
     this.pluginPkgs = []
     this.pluginNames = []

package/boot/class/bajo-plugin/helper/attach-method.js

@@ -6,7 +6,7 @@ async function attachMethod () {
   me.bajo.log.debug('attachMethods')
   await eachPlugins(async function ({ ns, pkgName }) {
     const dir = ns === me.bajo.mainNs ? (`${me.bajo.dir.base}/${me.bajo.mainNs}`) : me.bajo.getModuleDir(pkgName)
-    const num = await createMethod.call(me[ns], `${dir}/bajo/method`, pkgName)
+    const num = await createMethod.call(me[ns], `${dir}/plugin/method`, pkgName)
     me.bajo.log.trace('- %s (%d)', ns, num)
   })
 }

package/boot/class/bajo-plugin/helper/collect-exit-handlers.js

@@ -3,7 +3,7 @@ async function collectExitHandlers () {
   if (!this.bajo.config.exitHandler) return
   const nss = []
   await eachPlugins(async function ({ ns, dir }) {
-    const mod = await importModule(`${dir}/bajo/exit.js`)
+    const mod = await importModule(`${dir}/plugin/exit.js`)
     if (!mod) return undefined
     this.app[ns].exitHandler = mod
     nss.push(ns)

package/boot/class/bajo-plugin.js

@@ -13,13 +13,13 @@ class BajoPlugin extends Plugin {
     this.state = {}
   }
 
-  async loadConfig () {
+  loadConfig = async () => {
     const { log, getModuleDir, readJson, defaultsDeep } = 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}/bajo/config`)
-    this.alias = this.pkgName.slice(0, 5) === 'bajo-' ? this.pkgName.slice(5).toLowerCase() : this.name.toLowerCase()
-    const aliasFile = `${dir}/bajo/.alias`
+    let cfg = await readAllConfigs.call(this.app, `${dir}/plugin/config`)
+    this.alias = this.alias ?? (this.pkgName.slice(0, 5) === 'bajo-' ? this.pkgName.slice(5).toLowerCase() : this.name.toLowerCase())
+    const aliasFile = `${dir}/plugin/.alias`
     if (fs.existsSync(aliasFile)) this.alias = fs.readFileSync(aliasFile, 'utf8')
     this.alias = camelCase(this.alias)
 
@@ -41,19 +41,19 @@ class BajoPlugin extends Plugin {
       cfg = defaultsDeep({}, omit(altCfg, omittedPluginKeys), cfg)
     } catch (err) {}
     const envArgv = defaultsDeep({}, omit(this.app.env[this.name] ?? {}, omittedPluginKeys) ?? {}, omit(this.app.argv[this.name] ?? {}, omittedPluginKeys) ?? {})
-    cfg = defaultsDeep({}, envArgv ?? {}, cfg ?? {})
+    cfg = defaultsDeep({}, envArgv ?? {}, cfg ?? {}, this.config ?? {})
     this.title = this.title ?? cfg.title ?? titleize(this.alias)
 
-    this.dependencies = []
-    const depFile = `${dir}/bajo/.dependencies`
+    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'])
   }
 
-  async _onoff (item, ...args) {
+  _onoff = async (item, ...args) => {
     this.state[item] = false
     const { runHook, importModule } = this.app.bajo
-    const mod = await importModule(`${this.dir.pkg}/bajo/${item}.js`)
+    const mod = await importModule(`${this.dir.pkg}/plugin/${item}.js`)
     if (mod) {
       const text = this.print.write('plugin%s', this.print.write(item))
       this.log.trace(text)
@@ -64,17 +64,17 @@ class BajoPlugin extends Plugin {
     this.state[item] = true
   }
 
-  async init () {
+  init = async () => {
     await this._onoff('init')
   }
 
-  async start (...args) {
+  start = async (...args) => {
     const { freeze } = this.app.bajo
     freeze(this.config)
     await this._onoff('start', ...args)
   }
 
-  async stop () {
+  stop = async () => {
     await this._onoff('stop')
   }
 }

package/boot/class/error.js

@@ -12,7 +12,7 @@ class BajoError {
     this.write()
   }
 
-  write (fatal) {
+  write = () => {
     let err
     if (this.payload.class) err = this.payload.class(this.message)
     else err = Error(this.message)
@@ -31,10 +31,18 @@ class BajoError {
       err[key] = value
     }
     if (!isEmpty(values)) err.values = values
+    err.ns = this.plugin.name
+    err.orgMessage = this.orgMessage
     return err
   }
 
-  formatErrorDetails (value) {
+  fatal = () => {
+    const err = this.write()
+    console.error(err)
+    process.kill(process.pid, 'SIGINT')
+  }
+
+  formatErrorDetails = (value) => {
     const { isString } = this.plugin.app.bajo.lib._
     const result = {}
     const me = this

package/boot/class/log.js

@@ -12,24 +12,24 @@ class Log {
     this.format = 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'
   }
 
-  init () {
+  init = () => {
     this.bajoLog = this.plugin.app.bajo.config.log.logger ?? 'bajoLogger'
   }
 
-  write (text, ...args) {
+  write = (text, ...args) => {
     return this.plugin.print.write(text, ...args)
   }
 
-  isExtLogger () {
+  isExtLogger = () => {
     return this.plugin.app[this.bajoLog] && this.plugin.app[this.bajoLog].logger
   }
 
-  child () {
+  child = () => {
     if (this.isExtLogger()) return this.plugin.app[this.bajoLog].logger.child()
     return this.plugin.app
   }
 
-  formatMsg (level, ...params) {
+  formatMsg = (level, ...params) => {
     if (this.plugin.app.bajo.config.log.level === 'silent') return
     if (!isLogInRange.call(this.plugin.app.bajo, level)) return
     let [data, msg, ...args] = params

package/boot/class/plugin.js

@@ -16,7 +16,7 @@ class Plugin {
     this.exitHandler = undefined
   }
 
-  getConfig (path, options = {}) {
+  getConfig = (path, options = {}) => {
     let obj = isEmpty(path) ? this.config : get(this.config, path, options.defValue)
     options.omit = options.omit ?? omittedPluginKeys
     if (isPlainObject(obj) && !isEmpty(options.omit)) obj = omit(obj, options.omit)
@@ -24,30 +24,26 @@ class Plugin {
     return obj
   }
 
-  initLog () {
+  initLog = () => {
     this.log = new Log(this)
     this.log.init()
   }
 
-  initPrint (opts) {
+  initPrint = (opts) => {
     this.print = new Print(this, opts)
     this.print.init()
   }
 
-  error (msg, ...args) {
+  error = (msg, ...args) => {
     if (!this.print) return new Error(msg, ...args)
     const error = new BajoError(this, msg, ...args)
     return error.write()
   }
 
-  fatal (msg, ...args) {
-    let e
-    if (this.print) {
-      const error = new BajoError(this, msg, ...args)
-      e = error.write(true)
-    } else e = new Error(msg, ...args)
-    console.error(e)
-    process.kill(process.pid, 'SIGINT')
+  fatal = (msg, ...args) => {
+    if (!this.print) return new Error(msg, ...args)
+    const error = new BajoError(this, msg, ...args)
+    return error.fatal()
   }
 }
 

package/boot/class/print.js

@@ -18,7 +18,7 @@ class Print {
     this.intl = {}
   }
 
-  init () {
+  init = () => {
     for (const l of this.plugin.app.bajo.config.intl.supported) {
       this.intl[l] = {}
       const path = `${this.plugin.dir.pkg}/bajo/intl/${l}.json`
@@ -30,7 +30,7 @@ class Print {
     }
   }
 
-  write (text, ...args) {
+  write = (text, ...args) => {
     const opts = last(args)
     let lang = this.plugin.app.bajo.config.lang
     if (isPlainObject(opts)) {
@@ -67,7 +67,7 @@ class Print {
     return sprintf(trans, ...params)
   }
 
-  setOpts (args = []) {
+  setOpts = (args = []) => {
     const config = this.plugin.app.bajo.config
     let opts = {}
     if (isPlainObject(args.slice(-1)[0])) opts = args.pop()
@@ -75,7 +75,7 @@ class Print {
     this.opts = defaultsDeep(opts, this.opts)
   }
 
-  setText (text, ...args) {
+  setText = (text, ...args) => {
     text = this.write(text, ...args)
     this.setOpts(args)
     const prefixes = []
@@ -88,65 +88,65 @@ class Print {
     return this
   }
 
-  getElapsed (unit = 'hms') {
+  getElapsed = (unit = 'hms') => {
     const u = unit === 'hms' ? 'second' : unit
     const elapsed = this.plugin.app.bajo.lib.dayjs().diff(this.startTime, u)
     return unit === 'hms' ? this.plugin.app.bajo.secToHms(elapsed) : elapsed
   }
 
-  start (text, ...args) {
+  start = (text, ...args) => {
     this.setOpts(args)
     this.setText(text, ...args)
     this.ora.start()
     return this
   }
 
-  stop () {
+  stop = () => {
     this.ora.stop()
     return this
   }
 
-  succeed (text, ...args) {
+  succeed = (text, ...args) => {
     this.setText(text, ...args)
     this.ora.succeed()
     return this
   }
 
-  fail (text, ...args) {
+  fail = (text, ...args) => {
     this.setText(text, ...args)
     this.ora.fail()
     return this
   }
 
-  warn (text, ...args) {
+  warn = (text, ...args) => {
     this.setText(text, ...args)
     this.ora.warn()
     return this
   }
 
-  info (text, ...args) {
+  info = (text, ...args) => {
     this.setText(text, ...args)
     this.ora.info()
     return this
   }
 
-  clear () {
+  clear = () => {
     this.ora.clear()
     return this
   }
 
-  render () {
+  render = () => {
     this.ora.render()
     return this
   }
 
-  fatal (text, ...args) {
+  fatal = (text, ...args) => {
     this.setText(text, ...args)
     this.ora.fail()
     process.kill(process.pid, 'SIGINT')
   }
 
-  spinner () {
+  spinner = () => {
     return new Print(this.plugin)
   }
 }

package/package.json

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

package/boot/class/bajo-core/method/slice-string.js

@@ -1,13 +0,0 @@
-function sliceString (content, start, end) {
-  const idx1 = content.indexOf(start)
-  if (idx1 === -1) return false
-  let idx2 = content.indexOf(end)
-  if (idx2 === -1) return false
-  if (idx2 < idx1) {
-    const tmp = content.slice(idx1)
-    idx2 = tmp.indexOf(end) + idx1
-  }
-  return content.slice(idx1, idx2 + end.length)
-}
-
-export default sliceString

package/boot/lib/translate.js

@@ -1,19 +0,0 @@
-import lodash from 'lodash'
-import Sprintf from 'sprintf-js'
-const { sprintf } = Sprintf
-const { get, isPlainObject } = lodash
-
-function translate (instance, text, ...args) {
-  let ntext = text
-  if (text) {
-    const i18n = instance ?? get(this, 'app.bajoI18N.instance')
-    if (i18n) {
-      if (isPlainObject(args[0])) ntext = i18n.t(text, args[0])
-      else ntext = i18n.t(text, { ns: this.name, postProcess: 'sprintf', sprintf: args })
-    } else ntext = sprintf(text, ...args)
-  }
-  if (ntext === '') ntext = text
-  return ntext
-}
-
-export default translate