bajo 1.0.5 → 1.0.7

package/bajo/intl/en-US.json

@@ -1,7 +1,7 @@
 {
   "packageNotFoundOrNotBajo%s": "Package '%s' not found or isn't a valid Bajo package",
   "unknownPluginOrNotLoaded%s": "Unknown plugin '%s' or plugin isn't loaded yet",
-  "collectionExists%s": "Collection '%s' already exists",
+  "collExists%s": "Collection '%s' already exists",
   "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'",
@@ -132,5 +132,16 @@
   "applet": "Applet",
   "unsupported%s%s": "Unsupported %s '%s'",
   "error%": "Error: %s",
-  "savedAs%%": "%s saved as '%s'"
+  "savedAs%%": "%s saved as '%s'",
+  "loaded%s": "Loaded %s",
+  "production": "production",
+  "staging": "staging",
+  "development": "development",
+  "unsupportedLangFallbackTo%s": "Unsupported language, fallback to '%s'",
+  "plugin%s": "%s plugin...",
+  "init": "Init",
+  "start": "Start",
+  "stop": "Stop",
+  "supportDisabled%s": "%s support is disabled",
+  "collect%s": "Collect %s"
 }

package/bajo/intl/id.json

@@ -1,41 +1,41 @@
 {
-  "packageNotFoundOrNotBajo%s": "Package '%s' not found or isn't a valid Bajo package",
-  "unknownPluginOrNotLoaded%s": "Unknown plugin '%s' or plugin isn't loaded yet",
-  "collectionExists%s": "Collection '%s' already exists",
-  "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",
-  "cantFind%s": "Can't find %s",
-  "dtUnparsable%s": "Date/time unparsable '%s'",
-  "cantParse%s": "'Can't parse '%s'",
-  "noConfigFileFound": "No config file found",
-  "pluginNameClash%s%s%s%s": "Plugin name clash: '%s (%s)' with '%s (%s)'",
-  "dependencyUnfulfilled%s%s": "Dependency for '%s' unfulfilled: %s",
-  "semverCheckFailed%s%s": "Semver check '%s' against '%s' failed",
-  "ddirNotExists%s": "Data directory '%s' doesn't exists!",
-  "signalReceived%s": "'%s' signal received",
-  "noAppletLoaded": "No applets loaded. Aborted!",
-  "oneOrMoreSharedTheSame%s%s": "One or more %s shared the same '%s'",
-  "bootCompleted%s": "Boot process completed in %s",
-  "runInEnv%s": "Run in '%s' environment",
-  "appRunningAsApplet": "App is running as applet...",
-  "setupBootOrder": "Setup boot order",
+  "packageNotFoundOrNotBajo%s": "Paket '%s' tidak ditemukan atau bukan sebuah paket Bajo yang valid",
+  "unknownPluginOrNotLoaded%s": "Plugin '%s' tidak dikenal atau plugin belum termuat",
+  "collExists%s": "Koleksi '%s' sudah ada",
+  "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",
+  "cantFind%s": "Tidak bisa menemukan %s",
+  "dtUnparsable%s": "Tanggal/waktu tidak bisa di parsing '%s'",
+  "cantParse%s": "'Tidak bisa memparsing '%s'",
+  "noConfigFileFound": "Tidak ditemukan berkas konfigurasi satupun",
+  "pluginNameClash%s%s%s%s": "Bentrokan nama plugin: '%s (%s)' dengan '%s (%s)'",
+  "dependencyUnfulfilled%s%s": "Ketergantungan untuk '%s' tidak terpenuhi: %s",
+  "semverCheckFailed%s%s": "Cek Semver '%s' terhadap '%s' gagal",
+  "ddirNotExists%s": "Direktori data '%s' tidak ada!",
+  "signalReceived%s": "Sinyal '%s' diterima",
+  "noAppletLoaded": "Tidak ada applet yang termuat. Batalkan!",
+  "oneOrMoreSharedTheSame%s%s": "Satu atau lebih %s berbagi '%s'",
+  "bootCompleted%s": "Proses booting komplit dalam %s",
+  "runInEnv%s": "Berjalan di lingkungan '%s'",
+  "appRunningAsApplet": "App berjalan sebagai applet...",
+  "setupBootOrder": "Atur urutan booting",
   "configHandlers%s": "Pengatur konfigurasi: %s",
   "exited": "Exited",
-  "appShutdown": "App shutdown",
-  "appletModeActivated": "Applet mode activated",
-  "collected%s%d": "%s collected: %d",
-  "attachMethods": "Attach methods",
-  "readConfigs": "Read configurations",
-  "checkAliasNameClash": "Checking alias & name clashes",
-  "checkDeps": "Checking dependencies",
-  "collectHooks": "Collect hooks",
-  "loadedPlugins%s": "Loaded plugins: %s",
-  "collecting%s": "Collecting %s",
-  "hookExecuted%s": "Hook '%s' executed",
-  "exitHandlers%s": "Exit handlers: %s",
-  "savedAs%s": "Saved as '%s'",
+  "appShutdown": "Aplikasi ditutup",
+  "appletModeActivated": "Mode applet diaktifkan",
+  "collected%s%d": "%s terkoleksi: %d",
+  "attachMethods": "Tempelkan metode",
+  "readConfigs": "Baca konfigurasi",
+  "checkAliasNameClash": "Cek bentrokan nama dan alias",
+  "checkDeps": "Cek ketergantungan",
+  "collectHooks": "Kumpulkan Hooks",
+  "loadedPlugins%s": "Plugin termuat: %s",
+  "collecting%s": "Mengumpulkan %s",
+  "hookExecuted%s": "Hook '%s' dieksekusi",
+  "exitHandlers%s": "Penanganan keluar: %s",
+  "savedAs%s": "Simpan sbg '%s'",
   "aborted": "Dibatalkan",
   "done": "Selesai",
   "error": "Kesalahan",
@@ -132,5 +132,16 @@
   "applet": "Applet",
   "unsupported%s%s": "%s '%s' tidak didukung",
   "error%": "Kesalahan: %s",
-  "savedAs%%": "%s disimpan sbg '%s'"
+  "savedAs%%": "%s disimpan sbg '%s'",
+  "loaded%s": "%s termuat",
+  "production": "produksi",
+  "staging": "pemanggungan",
+  "development": "pengembangan",
+  "unsupportedLangFallbackTo%s": "Bahasa tidak didukung, gunakan '%s'",
+  "plugin%s": "%s plugin...",
+  "init": "Inisiasi",
+  "start": "Jalankan",
+  "stop": "Berhentikan",
+  "supportDisabled%s": "Dukungan %s dimatikan",
+  "collect%s": "Koleksi %s"
 }

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

@@ -28,7 +28,7 @@ async function bootOrder () {
     result.push(item)
   })
   this.pluginPkgs = map(orderBy(result, ['v']), 'k')
-  this.log.info('runInEnv%s', this.envs[this.config.env])
+  this.log.info('runInEnv%s', this.print.write(this.envs[this.config.env]))
   // misc
   this.freeze(this.config)
 }

package/boot/class/bajo-core/method/build-collections.js

@@ -17,7 +17,7 @@ async function buildCollections (options = {}) {
     const item = items[index]
     if (useDefaultName) {
       if (!has(item, 'name')) {
-        if (find(items, { name: 'default' })) throw this.app[ns].error('collectionExists%s', 'default')
+        if (find(items, { name: 'default' })) throw this.app[ns].error('collExists%s', 'default')
         else item.name = 'default'
       }
     }

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

@@ -1,6 +1,6 @@
 const envs = {
   dev: 'development',
-  staging: 'Staging',
+  staging: 'staging',
   prod: 'production'
 }
 

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

@@ -1,7 +1,7 @@
-function format (value, type, lang, options = {}) {
-  const { defaultsDeep } = this.app.bajo
+function format (value, type, options = {}) {
   const { format } = this.config.intl
   const { emptyValue = format.emptyValue } = options
+  const lang = options.lang ?? this.config.lang
   if ([undefined, null, ''].includes(value)) return emptyValue
   if (type === 'auto') {
     if (value instanceof Date) type = 'datetime'
@@ -9,7 +9,7 @@ function format (value, type, lang, options = {}) {
   if (['integer', 'smallint'].includes(type)) {
     value = parseInt(value)
     if (isNaN(value)) return emptyValue
-    const setting = defaultsDeep(options.integer, format.integer)
+    const setting = this.defaultsDeep(options.integer, format.integer)
     return new Intl.NumberFormat(lang, setting).format(value)
   }
   if (['float', 'double'].includes(type)) {
@@ -17,15 +17,15 @@ function format (value, type, lang, options = {}) {
     if (isNaN(value)) return emptyValue
     if (this.app.bajoSpatial && options.latitude) return this.app.bajoSpatial.latToDms(value)
     if (this.app.bajoSpatial && options.longitude) return this.app.bajoSpatial.lngToDms(value)
-    const setting = defaultsDeep(options.float, format.float)
+    const setting = this.defaultsDeep(options.float, format.float)
     return new Intl.NumberFormat(lang, setting).format(value)
   }
   if (['datetime', 'date'].includes(type)) {
-    const setting = defaultsDeep(options[type], format[type])
+    const setting = this.defaultsDeep(options[type], format[type])
     return new Intl.DateTimeFormat(lang, setting).format(new Date(value))
   }
   if (['time'].includes(type)) {
-    const setting = defaultsDeep(options.time, format.time)
+    const setting = this.defaultsDeep(options.time, format.time)
     return new Intl.DateTimeFormat(lang, setting).format(new Date(`1970-01-01T${value}Z`))
   }
   if (['array'].includes(type)) return value.join(', ')

package/boot/class/bajo-plugin.js

@@ -50,11 +50,12 @@ class BajoPlugin extends Plugin {
     this.config = omit(cfg, ['title', 'dependencies'])
   }
 
-  async _onoff (item, text, ...args) {
+  async _onoff (item, ...args) {
     this.state[item] = false
     const { runHook, importModule } = this.app.bajo
     const mod = await importModule(`${this.dir.pkg}/bajo/${item}.js`)
     if (mod) {
+      const text = this.print.write('plugin%s', this.print.write(item))
       this.log.trace(text)
       await runHook(`${this.name}:${camelCase(`before ${item}`)}`)
       await mod.call(this, ...args)
@@ -64,17 +65,17 @@ class BajoPlugin extends Plugin {
   }
 
   async init () {
-    await this._onoff('init', 'Init plugin...')
+    await this._onoff('init')
   }
 
   async start (...args) {
     const { freeze } = this.app.bajo
     freeze(this.config)
-    await this._onoff('start', 'Start plugin...', ...args)
+    await this._onoff('start', ...args)
   }
 
   async stop () {
-    await this._onoff('stop', 'Stop plugin...')
+    await this._onoff('stop')
   }
 }
 

package/boot/class/error.js

@@ -8,7 +8,7 @@ class BajoError {
     this.plugin = plugin
     this.payload = args.length > 0 && isPlainObject(args[args.length - 1]) ? args[args.length - 1] : {}
     this.orgMessage = msg
-    this.message = this.plugin.print.write(msg, ...args)
+    this.message = plugin.print.write(msg, ...args)
     this.write()
   }
 

package/boot/class/log.js

@@ -17,8 +17,7 @@ class Log {
   }
 
   write (text, ...args) {
-    const lang = this.plugin.app.bajo.config.lang
-    return this.plugin.print.write(text, lang, ...args)
+    return this.plugin.print.write(text, ...args)
   }
 
   isExtLogger () {

package/boot/class/print.js

@@ -4,8 +4,9 @@ import defaultsDeep from './bajo-core/method/defaults-deep.js'
 import fs from 'fs-extra'
 import Sprintf from 'sprintf-js'
 const { sprintf } = Sprintf
+let unknownLangWarning = false
 
-const { isPlainObject, get, without, reverse } = lodash
+const { isString, last, isPlainObject, get, without, reverse, map } = lodash
 
 class Print {
   constructor (plugin, opts = {}) {
@@ -29,8 +30,18 @@ class Print {
     }
   }
 
-  write (text, lang, ...args) {
-    const fallback = this.plugin.app.bajo.config.intl.fallback
+  write (text, ...args) {
+    const opts = last(args)
+    let lang = this.plugin.app.bajo.config.lang
+    if (isPlainObject(opts)) {
+      args.pop()
+      lang = opts.lang
+    }
+    const { fallback, supported } = this.plugin.app.bajo.config.intl
+    if (!unknownLangWarning && !supported.includes(lang)) {
+      unknownLangWarning = true
+      this.plugin.app.bajo.log.warn('unsupportedLangFallbackTo%s', fallback)
+    }
     const plugins = reverse(without([...this.plugin.app.bajo.pluginNames], this.plugin.name))
     plugins.unshift(this.plugin.name)
     plugins.push('bajo')
@@ -49,7 +60,11 @@ class Print {
       }
     }
     if (!trans) trans = text
-    return sprintf(trans, ...args)
+    const params = map(args, a => {
+      if (!isString(a)) return a
+      return a.replaceAll('%', '%%')
+    })
+    return sprintf(trans, ...params)
   }
 
   setOpts (args = []) {

package/package.json

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