waibu 2.8.0 → 2.8.2

package/index.js

@@ -13,6 +13,7 @@ import handleError from './lib/handle-error.js'
 import handleNotFound from './lib/handle-not-found.js'
 import handleHome from './lib/handle-home.js'
 import queryString from 'query-string'
+import handleBody from './lib/handle-body.js'
 
 /**
  * @typedef TEscapeChars
@@ -199,6 +200,7 @@ async function factory (pkgName) {
       await handleAppHook.call(this)
       await handleError.call(this)
       await routeHook.call(this, this.ns)
+      await handleBody.call(this)
       await webApp.call(this)
       await handleHome.call(this)
       await handleNotFound.call(this)

package/lib/handle-body.js

@@ -0,0 +1,33 @@
+export function normalizeValue (value) {
+  const { isSet } = this.app.lib.aneka
+  const { isArray, trim, isPlainObject } = this.app.lib._
+  if (!isSet(value)) return
+  if (value === 'null') value = null
+  else if (value === 'undefined') value = undefined
+  else {
+    const val = trim(value)
+    if (['{', '['].includes(val[0])) {
+      try {
+        const parsed = JSON.parse(val)
+        if (isPlainObject(parsed) || isArray(parsed)) value = parsed
+      } catch (err) {
+        value = val
+      }
+    } else value = val
+  }
+  return value
+}
+
+async function handleBody (options = {}) {
+  const { isPlainObject } = this.app.lib._
+  const me = this
+  this.instance.addHook('preValidation', async function (req, reply) {
+    if (req.body && isPlainObject(req.body)) {
+      for (const key in req.body) {
+        req.body[key] = normalizeValue.call(me, req.body[key])
+      }
+    }
+  })
+}
+
+export default handleBody

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

@@ -1,6 +1,7 @@
 import multipart from '@fastify/multipart'
 import { promisify } from 'util'
 import { pipeline } from 'stream'
+import { normalizeValue } from '../handle-body.js'
 import path from 'path'
 const pump = promisify(pipeline)
 
@@ -17,34 +18,16 @@ async function onFileHandler () {
 }
 
 async function handleMultipartBody (options = {}) {
-  const { importPkg } = this.app.bajo
-  const { defaultsDeep, isSet } = this.app.lib.aneka
-  const { isArray, map, trim, isPlainObject, isEmpty } = this.app.lib._
-  const parseVar = await importPkg('bajo:dotenv-parse-variables')
+  const { defaultsDeep } = this.app.lib.aneka
+  const { isArray, map, isEmpty } = this.app.lib._
+  const me = this
+
   if (options === false) return this.log.warn('middlewareDisabled%s', 'multipart')
   const opts = defaultsDeep(options, this.app.waibu.config.multipart)
   const onFile = await onFileHandler.call(this)
   opts.onFile = onFile
   await this.webAppCtx.register(multipart, opts)
 
-  function normalizeValue (value) {
-    if (!isSet(value)) return
-    if (value === 'null') value = null
-    else if (value === 'undefined') value = undefined
-    else {
-      const val = trim(value)
-      if (['{', '['].includes(val[0])) {
-        try {
-          const parsed = JSON.parse(val)
-          if (isPlainObject(parsed) || isArray(parsed)) value = parsed
-        } catch (err) {
-          value = val
-        }
-      } else value = parseVar({ item: value }).item
-    }
-    return value
-  }
-
   this.webAppCtx.addHook('preValidation', async function (req, reply) {
     if (req.isMultipart() && opts.attachFieldsToBody === true) {
       const body = Object.fromEntries(
@@ -53,9 +36,9 @@ async function handleMultipartBody (options = {}) {
           let value
           if (key.endsWith('[]') && !isArray(item)) item = [item]
           if (isArray(item)) {
-            value = map(item, i => normalizeValue(i.value))
+            value = map(item, i => normalizeValue.call(me, i.value))
           } else {
-            value = normalizeValue(item.value)
+            value = normalizeValue.call(me, item.value)
           }
           key = key.replace('[]', '')
           return [key, value]

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-03-06
+
+- [2.8.1] Bug fix on ```req.body``` parsing
+- [2.8.2] Bug fix on ```preValidation```
+
 ## 2026-03-02
 
 - [2.8.0] Remove ```sendMail()``` as from now on it will be using sumba's ```sendMail()```