bajo 1.0.7 → 1.0.9

package/bajo/intl/en-US.json

@@ -5,7 +5,7 @@
   "cantLocateNpmGlobalDir": "Can't locate npm global module directory",
   "cantLocateGlobalDir%s": "Can't locate '%s' global module directory",
   "cantFindMethod%s": "Can't find method named '%s'",
-  "pluginWithALiasNotLoaded%s": "Plugin with alias '%s' is not loaded",
+  "pluginWithAliasNotLoaded%s": "Plugin with alias '%s' is not loaded",
   "cantFind%s": "Can't find %s",
   "dtUnparsable%s": "Date/time unparsable '%s'",
   "cantParse%s": "'Can't parse '%s'",
@@ -143,5 +143,9 @@
   "start": "Start",
   "stop": "Stop",
   "supportDisabled%s": "%s support is disabled",
-  "collect%s": "Collect %s"
+  "collect%s": "Collect %s",
+  "andL": "and",
+  "orL": "or",
+  "noneL": "none",
+  "isRequired%s": "'%s' is required"
 }

package/bajo/intl/id.json

@@ -5,7 +5,7 @@
   "cantLocateNpmGlobalDir": "Tidak bisa menentukan direktori global npm",
   "cantLocateGlobalDir%s": "Tidak bisa menentukan direktori global modul '%s'",
   "cantFindMethod%s": "Tidak menemukan metode dengan nama '%s'",
-  "pluginWithALiasNotLoaded%s": "Plugin dengan alias '%s' tidak termuat",
+  "pluginWithAliasNotLoaded%s": "Plugin dengan alias '%s' tidak termuat",
   "cantFind%s": "Tidak bisa menemukan %s",
   "dtUnparsable%s": "Tanggal/waktu tidak bisa di parsing '%s'",
   "cantParse%s": "'Tidak bisa memparsing '%s'",
@@ -143,5 +143,8 @@
   "start": "Jalankan",
   "stop": "Berhentikan",
   "supportDisabled%s": "Dukungan %s dimatikan",
-  "collect%s": "Koleksi %s"
+  "collect%s": "Koleksi %s",
+  "andL": "dan",
+  "orL": "atau",
+  "noneL": "kosong"
 }

package/boot/class/bajo-core/helper/exit-handler.js

@@ -25,10 +25,9 @@ async function exitHandler () {
   })
 
   process.on('uncaughtException', (error, origin) => {
-    if (this.config.log.report.includes('sys:uncaughtException')) this.log.fatal({ origin }, '%s', error.message)
     setTimeout(() => {
       console.error(error)
-      process.exit(1)
+      // process.exit(1)
     }, 50)
   })
 

package/boot/class/bajo-core/method/extract-text.js

@@ -0,0 +1,14 @@
+function extractText (text, start, end) {
+  let result = ''
+  const open = text.indexOf(start)
+  if (open > -1) {
+    text = text.slice(open + end.length)
+    const close = text.indexOf(end)
+    if (close > -1) {
+      result = text.slice(0, close)
+    }
+  }
+  return result
+}
+
+export default extractText

package/boot/class/bajo-core/method/get-plugin.js

@@ -13,7 +13,7 @@ function getPlugin (name, silent) {
     }
     if (!plugin) {
       if (silent) return false
-      throw this.error('pluginWithALiasNotLoaded%s', name)
+      throw this.error('pluginWithAliasNotLoaded%s', name)
     }
     name = plugin.name
   }

package/boot/class/bajo-core/method/join.js

@@ -4,12 +4,15 @@ import isSet from './is-set.js'
 const { isPlainObject } = lodash
 
 function join (array, sep) {
-  const isI18n = this && this.app && this.app.bajoI18N
-  if (array.length === 0) return isI18n ? this.app.bajoI18N.t('none') : 'none'
+  const translate = val => {
+    if (this && this.print) return this.print.write(val)
+    return val
+  }
+  if (array.length === 0) return translate('noneL')
   if (array.length === 1) return array[0]
   if (isSet(sep) && !isPlainObject(sep)) return array.join(sep)
-  let { separator = ', ', joiner = 'and' } = sep ?? {}
-  if (isI18n && this.app.bajoI18N.t) joiner = this.app.bajoI18N.t(joiner)
+  let { separator = ', ', joiner = 'andL' } = sep ?? {}
+  joiner = translate(joiner)
   const last = (array.pop() ?? '').trim()
   return array.map(a => (a + '').trim()).join(separator) + ` ${joiner} ${last}`
 }

package/boot/class/bajo-core/method/parse-object.js

@@ -42,11 +42,9 @@ function parseObject (input, { silent = true, parseValue = false, lang, ns } = {
             const scope = ns ? me.app[ns] : me
             let [text, ...args] = v.split('|')
             args = args.map(a => {
-              // if (a.slice(0, 2) === 't:') a = translate.call(scope, i18n, a.slice(2))
               if (a.slice(0, 2) === 't:') a = scope.print.write(lang, a.slice(2))
               return a
             })
-            // obj[newK] = translate.call(scope, i18n, text, ...args)
             obj[newK] = scope.print.write(text, lang, ...args)
           } else obj[newK] = v
           mutated.push(k)

package/boot/class/bajo-core.js

@@ -6,7 +6,7 @@ import readJson from './bajo-core/method/read-json.js'
 import lodash from 'lodash'
 const { isFunction } = lodash
 
-async function defConfigHandler (file, opts) {
+async function defConfigHandler (file, opts = {}) {
   let mod = await importModule(file)
   if (isFunction(mod)) mod = await mod.call(this, opts)
   return mod

package/boot/class/error.js

@@ -48,7 +48,7 @@ class BajoError {
       const val = get(v, 'context.value')
       value[i] = {
         field,
-        error: print.write(`validation.${v.type}`, v.context),
+        error: print.write(`validation.${v.type}`, v.context ?? {}, {}),
         value: val,
         ext: { type: v.type, context: v.context }
       }

package/boot/class/print.js

@@ -35,7 +35,7 @@ class Print {
     let lang = this.plugin.app.bajo.config.lang
     if (isPlainObject(opts)) {
       args.pop()
-      lang = opts.lang
+      if (opts.lang) lang = opts.lang
     }
     const { fallback, supported } = this.plugin.app.bajo.config.intl
     if (!unknownLangWarning && !supported.includes(lang)) {

package/package.json

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