waibu 1.1.20 → 1.1.22

package/lib/handle-forward.js

@@ -1,7 +1,7 @@
 import replyFrom from '@fastify/reply-from'
 
 async function handleForward (ctx) {
-  const { defaultsDeep } = this.app.bajo
+  const { defaultsDeep } = this.lib.aneka
   const me = this
 
   function rewriteHeaders (headers, req) {

package/lib/home.js

@@ -1,5 +1,6 @@
 async function home () {
-  const { defaultsDeep, callHandler } = this.app.bajo
+  const { callHandler } = this.app.bajo
+  const { defaultsDeep } = this.lib.aneka
   const { isString, pick } = this.lib._
   const config = this.getConfig()
   if (config.home) {

package/lib/webapp-scope/handle-compress.js

@@ -1,7 +1,7 @@
 import compress from '@fastify/compress'
 
 async function handleCompress (ctx, options = {}) {
-  const { defaultsDeep } = this.app.bajo
+  const { defaultsDeep } = this.lib.aneka
   if (options === false) return this.log.warn('middlewareDisabled%s', 'compress')
   const opts = defaultsDeep(options, this.app.waibu.config.compress)
   await ctx.register(compress, opts)

package/lib/webapp-scope/handle-cors.js

@@ -1,7 +1,7 @@
 import cors from '@fastify/cors'
 
 async function handleCors (ctx, options = {}) {
-  const { defaultsDeep } = this.app.bajo
+  const { defaultsDeep } = this.lib.aneka
   if (options === false) return this.log.warn('middlewareDisabled%s', 'cors')
   const opts = defaultsDeep(options, this.app.waibu.config.cors)
   await ctx.register(cors, opts)

package/lib/webapp-scope/handle-helmet.js

@@ -1,7 +1,7 @@
 import helmet from '@fastify/helmet'
 
 async function handleHelmet (ctx, options = {}) {
-  const { defaultsDeep } = this.app.bajo
+  const { defaultsDeep } = this.lib.aneka
   if (options === false) return this.log.warn('middlewareDisabled%s', 'helmet')
   const opts = defaultsDeep(options, this.app.waibu.config.helmet)
   await ctx.register(helmet, opts)

package/lib/webapp-scope/handle-multipart-body.js

@@ -17,7 +17,8 @@ async function onFileHandler () {
 }
 
 async function handleMultipartBody (ctx, options = {}) {
-  const { defaultsDeep, importPkg, isSet } = this.app.bajo
+  const { importPkg } = this.app.bajo
+  const { defaultsDeep, isSet } = this.lib.aneka
   const { isArray, map, trim, isPlainObject, isEmpty } = this.lib._
   const parseVar = await importPkg('bajo:dotenv-parse-variables')
   if (options === false) return this.log.warn('middlewareDisabled%s', 'multipart')

package/lib/webapp-scope/handle-rate-limit.js

@@ -2,7 +2,7 @@ import rateLimit from '@fastify/rate-limit'
 
 async function handleRateLimit (ctx, options = {}) {
   const { cloneDeep } = this.lib._
-  const { defaultsDeep } = this.app.bajo
+  const { defaultsDeep } = this.lib.aneka
   if (options === false) return this.log.warn('middlewareDisabled%s', 'rateLimit')
   const opts = defaultsDeep(options, this.app.waibu.config.rateLimit)
   await ctx.register(rateLimit, cloneDeep(opts))

package/package.json

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

package/plugin/factory.js

@@ -249,7 +249,8 @@ async function factory (pkgName) {
     }
 
     routePath = (name = '', options = {}) => {
-      const { defaultsDeep, getPlugin } = this.app.bajo
+      const { getPlugin } = this.app.bajo
+      const { defaultsDeep } = this.lib.aneka
       const { isEmpty, get, trimEnd, trimStart } = this.lib._
       const { breakNsPath } = this.app.bajo
       const { query = {}, base = 'waibu', params = {}, guessHost } = options
@@ -273,7 +274,7 @@ async function factory (pkgName) {
       let url = info.path
       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}`, '/')
-      url = url.split('/').map(u => encodeURI(u)).join('/')
+      if (options.uriEncoded) url = url.split('/').map(u => encodeURI(u)).join('/')
       info.qs = defaultsDeep({}, query, info.qs)
       if (!isEmpty(info.qs)) url += '?' + this.qs.stringify(info.qs)
       if (!url.startsWith('http') && guessHost) url = `http://${this.config.server.host}:${this.config.server.port}/${trimStart(url, '/')}`
@@ -298,7 +299,7 @@ async function factory (pkgName) {
     }
 
     unescapeBlock = (content, start, end, startReplacer, endReplacer) => {
-      const { extractText } = this.app.bajo
+      const { extractText } = this.lib.aneka
       const { result } = extractText(content, start, end)
       if (result.length === 0) return content
       const unescaped = this.unescape(result)