waibu 1.0.7 → 1.0.9

package/bajo/method/get-plugin-prefix.js

@@ -1,6 +1,11 @@
-function getPluginPrefix (base) {
+function getPluginPrefix (base, webApp = 'waibuMpa') {
   const { get, trim } = this.app.bajo.lib._
-  const prefix = get(this, `app.${base}.config.waibu.prefix`, this.app[base].alias)
+  let prefix = get(this, `app.${base}.config.waibu.prefix`, this.app[base].alias)
+  if (base === 'main') {
+    const cfg = this.app[webApp].config
+    if (cfg.mountMainAsRoot) prefix = ''
+  }
+
   return trim(prefix, '/')
 }
 

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)

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,16 @@ 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) => {
+    return this.app[defNs].print.write(text, req.lang, ...args)
   }
   req.format = (value, type = 'auto', opts) => {
-    return this.app.bajoI18N.format(value, type, req.lang, opts)
+    return this.app.bajo.format(value, type, req.lang, opts)
   }
 }
 
-export default attachI18N
+export default attachIntl

package/package.json

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