dobo 1.1.4 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Database ORM/ODM for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/plugin/method/sanitize/body.js

@@ -1,6 +1,6 @@
 async function sanitizeBody ({ body = {}, schema = {}, partial, strict, extFields = [] }) {
   const { isSet, dayjs, callHandler } = this.app.bajo
-  const { has, isString, isNumber, concat } = this.lib._
+  const { has, isString, isNumber, concat, isNaN } = this.lib._
   const result = {}
   for (const p of concat(schema.properties, extFields)) {
     if (partial && !has(body, p.name)) continue
@@ -48,14 +48,15 @@ async function sanitizeBody ({ body = {}, schema = {}, partial, strict, extField
         }
       }
     } else {
-      if (p.default) {
+      if (isSet(p.default)) {
         result[p.name] = p.default
         if (isString(p.default) && p.default.startsWith('handler:')) {
           const [, ...args] = p.default.split(':')
           if (args.length > 0) result[p.name] = await callHandler(args.join(':'))
         } else {
-          if (['float', 'double'].includes(p.type)) result[p.name] = parseFloat(result[p.name]) || null
-          if (['integer', 'smallint'].includes(p.type)) result[p.name] = parseInt(result[p.name]) || null
+          if (['float', 'double'].includes(p.type)) result[p.name] = parseFloat(result[p.name])
+          if (['integer', 'smallint'].includes(p.type)) result[p.name] = parseInt(result[p.name])
+          if (isNaN(result[p.name])) result[p.name] = null
         }
       }
     }

package/waibuMpa/route/attachment/@model/@id/@field/@file.js

@@ -1,20 +1,24 @@
 import path from 'path'
 
 async function attachment (req, reply) {
-  const { isString } = this.lib._
+  const { isString, isEmpty } = this.lib._
   const { importPkg, getPluginDataDir, pascalCase } = this.app.bajo
   const { routePath } = this.app.waibu
   const mime = await importPkg('waibu:mime')
-  const { fs } = this.lib
-  const file = `${getPluginDataDir('dobo')}/attachment/${pascalCase(req.params.model)}/${req.params.id}/${req.params.field}/${req.params.file}`
-  const mimeType = mime.getType(path.extname(file))
+  const { fs, fastGlob } = this.lib
+  let file = `${getPluginDataDir('dobo')}/attachment/${pascalCase(req.params.model)}/${req.params.id}/${req.params.field}/${req.params.file}`
+  if (path.basename(file) === '_first') {
+    const files = await fastGlob(`${path.dirname(file)}/*`)
+    if (files.length > 0) file = files[0]
+  }
+  const mimeType = mime.getType(path.extname(file)) ?? ''
   if (!fs.existsSync(file)) {
     if (!req.query.notfound) throw this.error('_notFound', { noContent: true })
     const [, ext] = mimeType.split('/')
-    const replacer = isString(req.query.notfound) ? req.query.notfound : `waibuStatic.asset:/not-found.${ext}`
+    const replacer = isString(req.query.notfound) ? req.query.notfound : `waibuStatic.asset:/not-found.${ext ?? 'png'}`
     return reply.redirectTo(routePath(replacer))
   }
-  reply.header('Content-Type', mimeType)
+  if (!isEmpty(mimeType)) reply.header('Content-Type', mimeType)
   const stream = fs.createReadStream(file)
   reply.send(stream)
   return reply