waibu 1.0.8 → 1.0.10

package/bajo/hook/on-close.js

@@ -1,5 +1,5 @@
 async function onClose () {
-  this.log.info('Server is closed')
+  this.log.info('serverIs%s', this.print.write('closedL'))
 }
 
 export default onClose

package/bajo/hook/on-ready.js

@@ -1,5 +1,5 @@
 async function onReady () {
-  this.log.info('Server is ready!')
+  this.log.info('serverIs%s', this.print.write('readyL'))
 }
 
 export default onReady

package/bajo/intl/en-US.json

@@ -0,0 +1,14 @@
+{
+  "pluginPrefixConflic%s%s%s": "Plugin prefix '%s' conflict between '%s' and '%s'",
+  "serverIs%s": "Server is %s",
+  "closedL": "closed",
+  "readyL": "ready",
+  "allRoutesConfigDisabled%s": "All '%s' routes are disabled by config",
+  "bootApp%s": "Boot app: %s",
+  "cantParseXmlBodyWithout%s": "Can't parse XML body unless package '%s' is loaded first",
+  "routesL": "routes",
+  "routeDisabled%s%s": "Route %s (%s) is disabled",
+  "rerouted%s%s": "Rerouted %s -> %s",
+  "bootSubApp%s": "Boot sub app: %s",
+  "routeNotFound%s%s": "Route '%s (%s)' not found"
+}

package/bajo/intl/id.json

@@ -0,0 +1,14 @@
+{
+  "pluginPrefixConflic%s%s%s": "Ada konflik di prefiks '%s' antara '%s' dan '%s'",
+  "serverIs%s": "Server %s",
+  "closedL": "tertutup",
+  "readyL": "siap sedia",
+  "allRoutesConfigDisabled%s": "Semua jalur '%s' dimatikan via konfigurasi",
+  "bootApp%s": "Jalankan aplikasi: %s",
+  "cantParseXmlBodyWithout%s": "Tidak bisa memparse bodi XML sebelum paket '%s' dimuat terlebih dahulu",
+  "routesL": "jalur",
+  "routeDisabled%s%s": "Jalur %s (%s) dimatikan",
+  "rerouted%s%s": "Jalur dipindahkan %s -> %s",
+  "bootSubApp%s": "Boot sub app: %s",
+  "routeNotFound%s%s": "Jalur '%s (%s)' tidak ditemukan"
+}

package/bajo/method/not-found.js

@@ -1,5 +1,5 @@
 function notFound (name, options) {
-  throw this.error('notFound', { path: name })
+  throw this.error('_notFound', { path: name })
 }
 
 export default notFound

package/bajo/method/route-path.js

@@ -20,7 +20,7 @@ function routePath (name = '', { query = {}, base = 'waibuMpa', params = {}, gue
     return p[0] === ':' && params[p.slice(1)] ? params[p.slice(1)] : p
   }).join('/')
   let url = info.path
-  const langDetector = get(cfg, 'i18n.detectors', [])
+  const langDetector = get(cfg, 'intl.detectors', [])
   if (info.ns) url = trimEnd(langDetector.includes('path') ? `/${params.lang ?? ''}${this.routeDir(info.ns)}${info.path}` : `${this.routeDir(info.ns)}${info.path}`, '/')
   info.qs = defaultsDeep({}, query, info.qs)
   if (!isEmpty(info.qs)) url += '?' + this.qs.stringify(info.qs)

package/bajo/start.js

@@ -22,8 +22,8 @@ async function start () {
 
   const instance = fastify(cfg.factory)
   instance.decorateRequest('lang', null)
-  instance.decorateRequest('i18n', null)
   instance.decorateRequest('t', () => {})
+  instance.decorateRequest('format', () => {})
   instance.decorateRequest('langDetector', null)
   instance.decorateRequest('site', null)
   instance.decorateRequest('ns', null)

package/lib/app.js

@@ -9,7 +9,7 @@ export async function collect (glob = 'boot.js', baseNs) {
   await eachPlugins(async function ({ config, file, ns, alias }) {
     const mod = await importModule(file, { asHandler: true })
     mod.prefix = get(config, 'waibu.prefix', alias)
-    if (get(config, 'i18n.detectors', []).includes('path')) mod.prefix = `/:lang${mod.prefix}`
+    if (get(config, 'intl.detectors', []).includes('path')) mod.prefix = `/:lang${mod.prefix}`
     mod.ns = ns
     mod.alias = alias
     mods.push(mod)
@@ -18,7 +18,7 @@ export async function collect (glob = 'boot.js', baseNs) {
   mods.forEach(m => {
     if (!prefixes[m.prefix]) prefixes[m.prefix] = []
     prefixes[m.prefix].push(m.plugin)
-    if (prefixes[m.prefix].length > 1) this.fatal('Plugin prefix \'%s\' conflic between \'%s\' and \'%s\'', m.prefix, prefixes[m.prefix][0], prefixes[m.prefix][1])
+    if (prefixes[m.prefix].length > 1) this.fatal('pluginPrefixConflic%s%s%s', m.prefix, prefixes[m.prefix][0], prefixes[m.prefix][1])
   })
   return orderBy(mods, ['level'])
 }
@@ -30,11 +30,11 @@ export async function boot () {
   for (const m of mods) {
     const disabled = this.app[m.ns].config.disabled
     if (Array.isArray(disabled) && disabled.length === 1 && ['*', 'all'].includes(disabled[0])) {
-      this.log.warn('All %s routes are disabled by config', m.ns)
+      this.log.warn('allRoutesConfigDisabled%s', m.ns)
       continue
     }
     await runHook(`${this.name}.${m.ns}:beforeAppBoot`)
-    this.log.debug('Boot app: %s', m.ns)
+    this.log.debug('bootApp%s', m.ns)
     await this.instance.register(async (ctx) => {
       const plugin = this.app[m.ns]
       plugin.instance = ctx

package/lib/handle-xml-body.js

@@ -2,7 +2,7 @@
 
 async function xmlBodyParser (ctx, opts = {}) {
   if (!this.app.bajoExtra) {
-    this.log.warn('Can\'t parse XML body unless package \'%s\' is loaded first', 'bajo-extra')
+    this.log.warn('cantParseXmlBodyWithout%s', 'bajo-extra')
     return
   }
   const { importPkg } = this.app.bajo

package/lib/log-routes.js

@@ -10,7 +10,7 @@ function printRoutes () {
     }
   })
   items = orderBy(items, ['url'])
-  this.log.debug('Loaded routes')
+  this.log.debug('loaded%s', this.print.write('routesL'))
   items.forEach(item => {
     this.log.debug('- %s (%s)', item.url, item.methods.join('|'))
   })

package/lib/webapp-scope/{attach-i18n.js → attach-intl.js}

@@ -1,7 +1,7 @@
 function detect (detector = [], req, reply) {
   const { get, map, trim, orderBy } = this.app.bajo.lib._
-  const supported = get(this, 'app.bajoI18N.config.supportedLngs', [this.app.bajo.config.lang])
-  const defLang = get(this, 'app.bajoI18N.config.lang', this.app.bajo.config.lang)
+  const supported = get(this, 'app.bajo.config.intl.supported', [this.app.bajo.config.lang])
+  const defLang = get(this, 'app.bajo.config.intl.fallback', this.app.bajo.config.lang)
   let lang = null
   // by route path
   if (detector.includes('path')) {
@@ -48,24 +48,18 @@ function detect (detector = [], req, reply) {
   req.lang = lang ?? defLang
 }
 
-async function attachI18N (detector = [], req, reply) {
-  if (!this.app.bajoI18N) return
-  const { importModule } = this.app.bajo
+async function attachIntl (detector = [], req, reply) {
   const { get } = this.app.bajo.lib._
-  const translate = await importModule('bajo:/boot/lib/translate.js')
   detect.call(this, detector, req, reply)
   const defNs = get(req, 'routeOptions.config.ns', this.name)
-  const opts = { defaultNS: defNs }
-  if (req.lang) opts.lng = req.lang
-  req.i18n = this.app.bajoI18N.instance.cloneInstance(opts)
-  req.t = (...args) => {
-    // console.log(args)
-    // const defNs = get(req, 'routeOptions.config.ns', this.name)
-    return translate.call(this.app[defNs], req.i18n, ...args)
+  req.t = (text, ...args) => {
+    args.push({ lang: req.lang })
+    return this.app[defNs].print.write(text, ...args)
   }
-  req.format = (value, type = 'auto', opts) => {
-    return this.app.bajoI18N.format(value, type, req.lang, opts)
+  req.format = (value, type = 'auto', opts = {}) => {
+    opts.lang = opts.lang ?? req.lang
+    return this.app.bajo.format(value, type, opts)
   }
 }
 
-export default attachI18N
+export default attachIntl

package/lib/webapp-scope/error-handler.js

@@ -6,9 +6,9 @@ async function errorHandler (ctx, extHandler) {
       reply.send(err.print)
       return
     }
-    if (me.app.bajo.config.log.level === 'trace' && !['notfound', 'redirect'].includes(err.message.toLowerCase())) console.error(err)
+    if (me.app.bajo.config.log.level === 'trace' && !['_notFound', '_redirect'].includes(err.message.toLowerCase())) console.error(err)
     if (extHandler) return await extHandler.call(me, err, req, reply, ctx)
-    if (err.message.toLowerCase() === 'notfound' || err.statusCode === 404) {
+    if (err.message === '_notFound' || err.statusCode === 404) {
       reply.code(err.statusCode)
       return
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {

package/bajoI18N/resource/id.json

@@ -1,46 +0,0 @@
-{
-  "[%s] Server is closed": "[%s] Penyelia telah tertutup",
-  "[%s] Server is ready!": "[%s] Penyelia telah siap!",
-  "Route '%s (%s)' not found": "Rute '%s (%s)' tidak ditemukan",
-  "Bad Request": "",
-  "Unauthorized": "Tidak Terautentikasi",
-  "Payment Required": "Pembayaran Disyaratkan",
-  "Forbidden": "Dilarang",
-  "Not Found": "Tidak Ditemukan",
-  "Method Not Allowed": "Metode Tidak Diperkenankan",
-  "Not Acceptable": "Tidak Bisa Diterima",
-  "Proxy Authentication Required": "",
-  "Request Timeout": "",
-  "Conflict": "",
-  "Gone": "",
-  "Length Required": "",
-  "Precondition Failed": "",
-  "Payload Too Large": "",
-  "URI Too Long": "",
-  "Unsupported Media Type": "",
-  "Range Not Satisfiable": "",
-  "Expectation Failed": "",
-  "Im A Teapot": "",
-  "Misdirected Request": "",
-  "Unprocessable Entity": "",
-  "Locked": "",
-  "Failed Dependency": "",
-  "Too Early": "",
-  "Upgrade Required": "",
-  "Precondition Required": "",
-  "Too Many Requests": "",
-  "Request Header Fields Too Large": "",
-  "Unavailable For Legal Reasons": "",
-  "Internal Server Error": "Kesalahan Internal Server",
-  "Not Implemented": "",
-  "Bad Gateway": "",
-  "Service Unavailable": "",
-  "Gateway Timeout": "",
-  "HTTP Version Not Supported": "",
-  "Variant Also Negotiates": "",
-  "Insufficient Storage": "",
-  "Loop Detected": "",
-  "Bandwidth Limit Exceeded": "",
-  "Not Extended": "",
-  "Network Authentication Require": ""
-}