bajo 1.0.8 → 1.0.10

package/bajo/intl/en-US.json

@@ -144,8 +144,9 @@
   "stop": "Stop",
   "supportDisabled%s": "%s support is disabled",
   "collect%s": "Collect %s",
-  "andL": "and",
-  "orL": "or",
-  "noneL": "none",
-  "isRequired%s": "'%s' is required"
+  "and": "and",
+  "or": "or",
+  "none": "none",
+  "isRequired%s": "'%s' is required",
+  "isDisabled%s": "'%s' is disabled"
 }

package/bajo/intl/id.json

@@ -144,7 +144,9 @@
   "stop": "Berhentikan",
   "supportDisabled%s": "Dukungan %s dimatikan",
   "collect%s": "Koleksi %s",
-  "andL": "dan",
-  "orL": "atau",
-  "noneL": "kosong"
+  "and": "dan",
+  "or": "atau",
+  "none": "kosong",
+  "isRequired%s": "'%s' disyaratkan",
+  "isDisabled%s": "'%s' dimatikan"
 }

package/boot/class/app.js

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

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

@@ -0,0 +1,15 @@
+function extractText (text, patternStart, patternEnd) {
+  let result = ''
+  const open = text.indexOf(patternStart)
+  if (open > -1) {
+    text = text.slice(open + patternStart.length)
+    const close = text.indexOf(patternEnd)
+    if (close > -1) {
+      result = text.slice(0, close)
+    }
+  }
+  const pattern = `${patternStart}${result}${patternEnd}`
+  return { result, pattern }
+}
+
+export default extractText

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

@@ -5,6 +5,7 @@ import lodash from 'lodash'
 const { trim } = lodash
 
 function getPluginFile (file) {
+  if (!this) return file
   if (file[0] === '.') file = `${currentLoc(import.meta).dir}/${trim(file.slice(1), '/')}`
   if (!this) return file
   if (file.includes(':')) {

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

@@ -5,13 +5,13 @@ const { isPlainObject } = lodash
 
 function join (array, sep) {
   const translate = val => {
-    if (this && this.print) return this.print.write(val)
+    if (this && this.print) return this.print.write(val).toLowerCase()
     return val
   }
-  if (array.length === 0) return translate('noneL')
+  if (array.length === 0) return translate('none')
   if (array.length === 1) return array[0]
   if (isSet(sep) && !isPlainObject(sep)) return array.join(sep)
-  let { separator = ', ', joiner = 'andL' } = sep ?? {}
+  let { separator = ', ', joiner = 'and' } = 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

@@ -3,7 +3,6 @@ import dotenvParseVariables from 'dotenv-parse-variables'
 import ms from 'ms'
 import dayjs from '../../../lib/dayjs.js'
 import isSet from './is-set.js'
-// import translate from '../../../lib/translate.js'
 
 const { isPlainObject, isArray, isNumber, set, cloneDeep, isString, omit } = lodash
 const statics = ['*']
@@ -40,12 +39,8 @@ function parseObject (input, { silent = true, parseValue = false, lang, ns } = {
           const newK = k.slice(2)
           if (lang) {
             const scope = ns ? me.app[ns] : me
-            let [text, ...args] = v.split('|')
-            args = args.map(a => {
-              if (a.slice(0, 2) === 't:') a = scope.print.write(lang, a.slice(2))
-              return a
-            })
-            obj[newK] = scope.print.write(text, lang, ...args)
+            const [text, ...args] = v.split('|')
+            obj[newK] = scope.print.write(text, ...args, { lang })
           } else obj[newK] = v
           mutated.push(k)
         } else if (parseValue) {

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.8",
+  "version": "1.0.10",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {