dobo 2.4.0 → 2.5.1

package/lib/factory/driver.js

@@ -37,6 +37,7 @@ async function driverFactory () {
         uniqueIndex: false,
         nullableField: true
       }
+      this.useUtc = false
       this.maxChunkSize = 500
       this.memory = false
       this.options = options
@@ -81,18 +82,28 @@ async function driverFactory () {
     }
 
     sanitizeRecord (model, record = {}) {
+      const { dayjs } = this.app.lib
+      const { isString } = this.app.lib._
       const item = { ...record }
       if (has(item, this.idField.name) && this.idField.name !== 'id') {
         item.id = item[this.idField.name]
         delete item[this.idField.name]
       }
       for (const prop of model.properties) {
-        if (isSet(item[prop.name]) && !this.support.propType[prop.type]) {
-          try {
-            if (prop.type === 'datetime') item[prop.name] = new Date(item[prop.name])
-            else if (['object', 'array'].includes(prop.type)) item[prop.name] = JSON.parse(item[prop.name])
-          } catch (err) {
-            item[prop.name] = null
+        if (isSet(item[prop.name])) {
+          if (!this.support.propType[prop.type]) {
+            try {
+              if (prop.type === 'datetime') {
+                const dt = this.useUtc ? dayjs.utc(item[prop.name]) : dayjs(item[prop.name])
+                item[prop.name] = dt.toDate()
+              } else if (['object', 'array'].includes(prop.type)) item[prop.name] = JSON.parse(item[prop.name])
+            } catch (err) {
+              item[prop.name] = null
+            }
+          }
+          if (prop.type === 'datetime' && isString(item[prop.name])) {
+            const dt = this.useUtc ? dayjs.utc(item[prop.name]) : dayjs(item[prop.name])
+            item[prop.name] = dt.toDate()
           }
         }
       }
@@ -247,9 +258,11 @@ async function driverFactory () {
 
     async _updateRecord (model, id, body = {}, options = {}) {
       if (!this.support.uniqueIndex) await this._checkUnique(model, body, options)
-      const resp = await this.getRecord(model, id, { noHook: true })
-      if (!resp.data) throw this.plugin.error('recordNotFound%s%s', id, model.name)
-      options._data = resp.data
+      if (!options._data) {
+        const resp = await this.getRecord(model, id, { noHook: true })
+        if (!resp.data) throw this.plugin.error('recordNotFound%s%s', id, model.name)
+        options._data = resp.data
+      }
       const input = this.sanitizeBody(model, body, true)
       delete input.id
       const result = await this.updateRecord(model, id, input, options)
@@ -262,9 +275,11 @@ async function driverFactory () {
     async _upsertRecord (model, body = {}, options = {}) {
       if (!this.uniqueIndexSupport) await this._checkUnique(model, body, options)
       if (isSet(body.id)) {
-        const resp = await this.getRecord(model, body.id, { noHook: true })
-        if (!resp.data) throw this.plugin.error('recordNotFound%s%s', body.id, model.name)
-        options._data = resp.data
+        if (!options._data) {
+          const resp = await this.getRecord(model, body.id, { noHook: true })
+          if (!resp.data) throw this.plugin.error('recordNotFound%s%s', body.id, model.name)
+          options._data = resp.data
+        }
       }
       const input = this.sanitizeBody(model, body)
       const result = await this.upsertRecord(model, input, options)
@@ -275,9 +290,11 @@ async function driverFactory () {
     }
 
     async _removeRecord (model, id, options = {}) {
-      const resp = await this.getRecord(model, id, { noHook: true })
-      if (!resp.data) throw this.plugin.error('recordNotFound%s%s', id, model.name)
-      options._data = resp.data
+      if (!options._data) {
+        const resp = await this.getRecord(model, id, { noHook: true })
+        if (!resp.data) throw this.plugin.error('recordNotFound%s%s', id, model.name)
+        options._data = resp.data
+      }
       const result = await this.removeRecord(model, id, options)
       if (options.noResult) return
       result.oldData = this.sanitizeRecord(model, result.oldData)

package/lib/factory/model/_util.js

@@ -124,7 +124,7 @@ export async function copyAttachment (id, options = {}) {
     if (parts.length === 0) continue
     fieldName = setField ?? fieldName
     const file = setFile ?? parts.join('@')
-    const opts = { source: f, fieldName, file, mimeType, stats, req, silent: true }
+    const opts = { source: f, fieldName, file, mimeType, stats, req }
     const rec = await this.createAttachment(id, opts)
     if (!rec) continue
     delete rec.dir
@@ -253,26 +253,36 @@ function sanitizeQuery (query = {}, parent) {
   const { dayjs } = this.app.lib
   const obj = cloneDeep(query)
   const keys = Object.keys(obj)
-  const sanitize = (key, val, p) => {
-    if (!isSet(val)) return val
-    const prop = find(this.properties, { name: key.startsWith('$') ? p : key })
+
+  const sanitizeField = (prop, val) => {
     if (!prop) return val
-    if (['datetime', 'date', 'time'].includes(prop.type)) {
+    if (['datetime'].includes(prop.type)) {
       const dt = dayjs(val)
       return dt.isValid() ? dt.toDate() : val
     } else if (['smallint', 'integer'].includes(prop.type)) return parseInt(val) || val
     else if (['float', 'double'].includes(prop.type)) return parseFloat(val) || val
     else if (['boolean'].includes(prop.type)) return !!val
+    else if (['string', 'text'].includes(prop.type)) return val + ''
     return val
   }
+
+  const sanitizeChild = (key, val, p) => {
+    if (!isSet(val)) return val
+    const prop = find(this.properties, { name: key.startsWith('$') ? p : key })
+    if (!prop) return val
+    return sanitizeField(prop, val)
+  }
+
   keys.forEach(k => {
     const v = obj[k]
+    const prop = find(this.properties, { name: k })
     if (isPlainObject(v)) obj[k] = sanitizeQuery.call(this, v, k)
     else if (isArray(v)) {
       v.forEach((i, idx) => {
         if (isPlainObject(i)) obj[k][idx] = sanitizeQuery.call(this, i, k)
+        else obj[k][idx] = sanitizeField(prop, i)
       })
-    } else obj[k] = sanitize(k, v, parent)
+    } else obj[k] = sanitizeChild(k, v, parent)
   })
   return obj
 }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 2026-01-30
+
+- [2.5.0] Add feature to push custom ```options._data```. If provided, this will be used instead of auto generated one.
+- [2.5.0] Remove ```silent``` in ```options``` object
+- [2.5.1] Driver now support ```this.useUtc``` for database that store values in UTC string
+- [2.5.1] Bug fix on ```driver.sanitizeRecord()```
+
 ## 2026-01-29
 
 - [2.4.0] Add ```bulkCreateRecords()``` on model & driver