dobo 2.29.2 → 2.30.1

package/extend/dobo/driver/memory.js

@@ -27,9 +27,8 @@ async function memoryDriverFactory () {
 
     async connect (connection, noRebuild) {
       const conn = this.plugin.getConnection('memory')
-      const { getPluginDataDir } = this.app.bajo
       const { fs } = this.app.lib
-      const dir = `${getPluginDataDir(this.plugin.ns)}/memDb/data` // persistence dir
+      const dir = `${this.app.getPluginDataDir(this.plugin.ns)}/memDb/data` // persistence dir
       fs.ensureDirSync(dir)
       conn.persistences = conn.persistences ?? []
 

package/index.js

@@ -233,13 +233,12 @@ async function factory (pkgName) {
      * @async
      */
     init = async () => {
-      const { getPluginDataDir } = this.app.bajo
       const { fs } = this.app.lib
       await collectDrivers.call(this)
       await collectConnections.call(this)
       await collectFeatures.call(this)
       await collectModels.call(this)
-      const attDir = `${getPluginDataDir('dobo')}/attachment`
+      const attDir = `${this.app.getPluginDataDir('dobo')}/attachment`
       fs.ensureDirSync(attDir)
     }
 
@@ -369,7 +368,6 @@ async function factory (pkgName) {
     sanitizeDate = (value, { inputFormat, outputFormat, silent = true } = {}) => {
       const { dayjs } = this.app.lib
       if (value === 0) return null
-      if (!outputFormat) outputFormat = inputFormat
       const dt = dayjs(value, inputFormat)
       if (!dt.isValid()) {
         if (silent) return null
@@ -428,6 +426,19 @@ async function factory (pkgName) {
       return value + ''
     }
 
+    sanitizeByType = (value, type, opts = {}) => {
+      const { isNaN } = this.app.lib._
+      let result = value
+      if (['object', 'array'].includes(type)) result = this.sanitizeObject(value, opts)
+      else if (type === 'boolean') result = this.sanitizeBoolean(value)
+      else if (['float', 'double'].includes(type)) result = this.sanitizeFloat(value, opts)
+      else if (['integer', 'smallint'].includes(type)) result = this.sanitizeInt(value, opts)
+      else if (['string', 'text'].includes(type)) result = this.sanitizeString(result, opts)
+      else if (['datetime'].includes(type)) result = this.sanitizeDate(result, opts)
+      if (!opts.strict && isNaN(result)) result = null
+      return result
+    }
+
     _calcStats = (items, field, aggregates) => {
       const { generateId, isSet } = this.app.lib.aneka
       const result = { id: generateId, count: 0, avg: null, min: null, max: null }

package/lib/factory/driver.js

@@ -378,7 +378,7 @@ async function driverFactory () {
         result = await this.findRecord(model, filter, options)
         await this._attachHook('afterFindRecord', model, filter, result, options)
       } catch (err) {
-        if (err.message !== '_emptyColumnQuery') throw err
+        if (!['_emptyColumnQuery', '_abortAction'].includes(err.message)) throw err
         result = {
           data: [],
           count: 0

package/lib/factory/model/_util.js

@@ -125,9 +125,8 @@ export async function mergeAttachmentInfo (rec, source, options = {}) {
 }
 
 export async function getAttachmentPath (id, field, file, options = {}) {
-  const { getPluginDataDir } = this.app.bajo
   const { fs } = this.app.lib
-  const dir = `${getPluginDataDir(this.app.dobo.ns)}/attachment/${this.name}/${id}`
+  const dir = `${this.app.getPluginDataDir(this.app.dobo.ns)}/attachment/${this.name}/${id}`
   if (options.dirOnly) return dir
   const path = field ? `${dir}/${field}/${file}` : `${dir}/${file}`
   if (!fs.existsSync(path)) throw this.app.dobo.error('notFound')
@@ -160,11 +159,10 @@ export async function copyAttachment (id, options = {}) {
 
 export async function handleAttachmentUpload (id, trigger, options = {}) {
   if (!this.options.attachment) return
-  const { getPluginDataDir } = this.app.bajo
   const { fs } = this.app.lib
   const { req, mimeType, stats, setFile, setField } = options
   if (trigger === 'removed') {
-    const dir = `${getPluginDataDir(this.app.dobo.ns)}/attachment/${this.name}/${id}`
+    const dir = `${this.app.getPluginDataDir(this.app.dobo.ns)}/attachment/${this.name}/${id}`
     await fs.remove(dir)
     return
   }

package/lib/factory/model/find-attachment.js

@@ -6,8 +6,7 @@ async function findAttachment (...args) {
   if (args.length === 0) return this.action(action, ...args)
   const [id, opts = {}] = args
   const { fastGlob, fs } = this.app.lib
-  const { getPluginDataDir } = this.app.bajo
-  const dir = `${getPluginDataDir(this.plugin.ns)}/attachment/${this.name}/${id}`
+  const dir = `${this.app.getPluginDataDir(this.plugin.ns)}/attachment/${this.name}/${id}`
   if (!fs.existsSync(dir)) return []
   const files = await fastGlob(`${dir}/**/*`)
   const { fullPath, stats, mimeType } = opts

package/lib/factory/model/list-attachment.js

@@ -6,13 +6,13 @@ async function listAttachment (...args) {
   if (args.length === 0) return this.action(action, ...args)
   const [params = {}, opts = {}] = args
   const { map, kebabCase } = this.app.lib._
-  const { importPkg, getPluginDataDir } = this.app.bajo
+  const { importPkg } = this.app.bajo
   const mime = await importPkg('waibu:mime')
   const { fastGlob } = this.app.lib
 
   const { id = '*', field = '*', file = '*', type } = params
   const { uriEncoded = true } = opts
-  const root = `${getPluginDataDir('dobo')}/attachment`
+  const root = `${this.app.getPluginDataDir('dobo')}/attachment`
   let pattern = `${root}/${this.name}/${id}/${field}/${file}`
   if (type === 'image') pattern += '.{jpg,jpeg,gif,png,webp,avif,svg}'
   else if (type === 'video') pattern += '.{mp4,m4v,webm,mov,qt,mkv,ogg,ogv}'

package/lib/factory/model/load-fixtures.js

@@ -2,7 +2,6 @@ import path from 'path'
 
 async function exec ({ body, spinner, options, result, bodies } = {}) {
   const { isArray, isString } = this.app.lib._
-  const { getPluginDataDir } = this.app.bajo
   const { fs } = this.app.lib
 
   await this.transaction(async (trx) => {
@@ -12,7 +11,7 @@ async function exec ({ body, spinner, options, result, bodies } = {}) {
         if (isString(att)) att = { field: 'file', file: att }
         const fname = path.basename(att.file)
         if (fs.existsSync(att.file)) {
-          const dest = `${getPluginDataDir(this.plugin.ns)}/${resp.id}/${att.field}/${fname}`
+          const dest = `${this.app.getPluginDataDir(this.plugin.ns)}/${resp.id}/${att.field}/${fname}`
           try {
             fs.copySync(att.file, dest)
           } catch (err) {}

package/lib/factory/model/sanitize-body.js

@@ -15,19 +15,13 @@
 async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDefault, truncateString, onlyTypes = [], action } = {}) {
   const { isSet } = this.app.lib.aneka
   const { callHandler } = this.app.bajo
-  const { omit, has, isString, isNaN } = this.app.lib._
-  const { sanitizeBoolean, sanitizeDate, sanitizeFloat, sanitizeInt, sanitizeObject, sanitizeString } = this.app.dobo
+  const { sanitizeByType } = this.app.dobo
+  const { omit, has, isString } = this.app.lib._
   const result = {}
 
   const sanitize = (name, type) => {
-    // if (onlyTypes.length > 0 && !onlyTypes.includes(type)) return
-    if (['object', 'array'].includes(type)) result[name] = sanitizeObject(result[name], { strict, action, model: this.name })
-    else if (type === 'boolean') result[name] = sanitizeBoolean(result[name])
-    else if (['float', 'double'].includes(type)) result[name] = sanitizeFloat(result[name], { strict })
-    else if (['integer', 'smallint'].includes(type)) result[name] = sanitizeInt(result[name], { strict })
-    else if (['string', 'text'].includes(type)) result[name] = sanitizeString(result[name], { strict })
-    else if (['datetime'].includes(type)) result[name] = sanitizeDate(result[name], { input: 'native' })
-    if (!strict && isNaN(result[name])) result[name] = null
+    const opts = { strict, action, model: this.name, outputFormat: 'native' }
+    result[name] = sanitizeByType(result[name], type, opts)
     if (['updateRecord', 'upsertRecord'].includes(action) && type === 'string' && result[name] === '') result[name] = null
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "2.29.2",
+  "version": "2.30.1",
   "description": "DBMS for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-06-12
+
+- [2.30.0] Necessary updates to ```bajo@2.18.0``` specs
+- [2.30.0] Add ```sanitizeByType()```
+- [2.30.0] Add ```error._abortAction``` to abort an action in driver level
+- [2.30.0] Refactor ```model.sanitizeBody()``` to use shared sanitizing function
+- [2.30.1] Bug fix in ```model.sanitizeBody()```
+
 ## 2026-06-11
 
 - [2.29.1] Bug fix in ```model.sanitizeBody()```