dobo 2.34.0 → 2.35.0

package/lib/factory/adapter.js

@@ -175,10 +175,11 @@ async function adapterFactory () {
      * Sanitizes a record retrieved from the database, converting data types as necessary
      * and ensuring that the record conforms to the model's schema.
      * @param {DoboModel} model - The model instance for which the record is being sanitized
-     * @param {object} record - The record retrieved from the database
+     * @param {object} [record={}] - The record retrieved from the database
+     * @param {object} [options={}] - Additional options for sanitization
      * @returns {object} - Sanitized record
      */
-    sanitizeRecord (model, record = {}) {
+    sanitizeRecord (model, record = {}, options = {}) {
       const { dayjs } = this.app.lib
       const { isString } = this.app.lib._
       const item = { ...record }
@@ -193,7 +194,7 @@ async function adapterFactory () {
               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])
+              } else if (isString(item[prop.name]) && ['object', 'array'].includes(prop.type)) item[prop.name] = JSON.parse(item[prop.name])
             } catch (err) {
               item[prop.name] = null
             }
@@ -461,7 +462,7 @@ async function adapterFactory () {
       await this._attachHook('afterCreateRecord', model, body, result, options)
 
       if (options.noResult) return
-      result.data = this.sanitizeRecord(model, result.data)
+      result.data = this.sanitizeRecord(model, result.data, options)
       this._injectMeta(result, options)
       return result
     }
@@ -512,7 +513,7 @@ async function adapterFactory () {
       await this._attachHook('afterGetRecord', model, id, result, options)
 
       if (isEmpty(result.data) && options.throwNotFound) throw this.plugin.error('recordNotFound%s%s', id, model.name)
-      result.data = this.sanitizeRecord(model, result.data)
+      result.data = this.sanitizeRecord(model, result.data, options)
       this._injectMeta(result, options)
       return result
     }
@@ -547,8 +548,8 @@ async function adapterFactory () {
       await this._attachHook('afterUpdateRecord', model, id, body, result, options)
 
       if (options.noResult) return
-      result.oldData = this.sanitizeRecord(model, result.oldData)
-      result.data = this.sanitizeRecord(model, result.data)
+      result.oldData = this.sanitizeRecord(model, result.oldData, options)
+      result.data = this.sanitizeRecord(model, result.data, options)
       this._injectMeta(result, options)
       return result
     }
@@ -584,8 +585,8 @@ async function adapterFactory () {
       await this._attachHook('afterUpsertRecord', model, body, result, options)
 
       if (options.noResult) return
-      if (result.oldData) result.oldData = this.sanitizeRecord(model, result.oldData)
-      result.data = this.sanitizeRecord(model, result.data)
+      if (result.oldData) result.oldData = this.sanitizeRecord(model, result.oldData, options)
+      result.data = this.sanitizeRecord(model, result.data, options)
       this._injectMeta(result, options)
       return result
     }
@@ -613,7 +614,7 @@ async function adapterFactory () {
       await this._attachHook('afterRemoveRecord', model, id, result, options)
 
       if (options.noResult) return
-      result.oldData = this.sanitizeRecord(model, result.oldData)
+      result.oldData = this.sanitizeRecord(model, result.oldData, options)
       this._injectMeta(result, options)
       return result
     }
@@ -664,7 +665,7 @@ async function adapterFactory () {
       }
 
       for (const idx in result.data) {
-        result.data[idx] = this.sanitizeRecord(model, result.data[idx])
+        result.data[idx] = this.sanitizeRecord(model, result.data[idx], options)
       }
       this._injectMeta(result, options)
       return result
@@ -698,7 +699,7 @@ async function adapterFactory () {
       }
 
       for (const idx in result.data) {
-        result.data[idx] = this.sanitizeRecord(model, result.data[idx])
+        result.data[idx] = this.sanitizeRecord(model, result.data[idx], options)
       }
       this._injectMeta(result, options)
       return result

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

@@ -10,11 +10,12 @@
  * @param {boolean} [opts.forceNoHidden=false] - If `true`, force ALL fields to be picked, thus ignoring hidden fields. If an array, force all fields except those in the array to be picked.
  * @param {boolean} [opts.fmt=false] - If `true`, add a `_fmt` property to the sanitized record with formatted values automatically based on the model's properties and rules
  * @param {Object} [opts.req] - Request object, used for formatting values based on request context
- * @param {Object} [opts.i18n] - Internationalization options, used for formatting values based on i18n context
- * @param {string} [opts.i18n.lang] - Language code for formatting values
- * @param {string} [opts.i18n.dateStyle] - Date style for formatting date values
- * @param {string} [opts.i18n.timeStyle] - Time style for formatting time values
- * @param {string} [opts.i18n.timeZone] - Time zone for formatting date/time values
+ * @param {Object} [opts.intl] - Internationalization options, used for formatting values based on i18n context
+ * @param {string} [opts.intl.lang] - Language code for formatting values
+ * @param {string} [opts.intl.datetime] - Date and time style for formatting datetime values
+ * @param {string} [opts.intl.date] - Date style for formatting date values
+ * @param {string} [opts.intl.time] - Time style for formatting time values
+ * @param {string} [opts.intl.timeZone] - Time zone for formatting date/time values
  * @returns {Object} Returns sanitized record object
  */
 async function sanitizeRecord (record = {}, opts = {}) {
@@ -56,14 +57,16 @@ async function sanitizeRecord (record = {}, opts = {}) {
       else if (isString(prop.format)) newRecord._fmt[key] = await callHandler(this.plugin, this, value, newRecord, opts)
       else {
         const options = {
-          lang: get(opts, 'i18n.lang', get(opts, 'req.lang')),
-          datetime: {
-            dateStyle: get(opts, 'i18n.dateStyle', get(opts, 'req.site.setting.sumba.dateStyle')),
-            timeStyle: get(opts, 'i18n.timeStyle', get(opts, 'req.site.setting.sumba.timeStyle')),
-            timeZone: get(opts, 'i18n.timeZone', get(opts, 'req.site.setting.sumba.timeZone'))
-          },
+          lang: get(opts, 'intl.lang', get(opts, 'req.lang')),
+          datetime: get(opts, 'intl.datetime', get(opts, 'req.site.setting.bajo.intl.datetime')),
+          date: get(opts, 'intl.date', get(opts, 'req.site.setting.bajo.intl.date')),
+          time: get(opts, 'intl.time', get(opts, 'req.site.setting.bajo.intl.time')),
+          timeZone: get(opts, 'intl.timeZone', get(opts, 'req.site.setting.bajo.intl.timeZone')),
+          emptyValue: get(opts, 'intl.emptyValue', get(opts, 'req.site.setting.bajo.intl.emptyValue')),
+          unitSys: get(opts, 'intl.unitSys', get(opts, 'req.site.setting.bajo.intl.unitSys')),
           latitude: ['lat', 'latitude'].includes(key),
-          longitude: ['lon', 'lng', 'longitude'].includes(key)
+          longitude: ['lon', 'lng', 'longitude'].includes(key),
+          field: key
         }
         newRecord._fmt[key] = format(value, prop.type, options)
       }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-07-29
+
+- [2.35.0] Add parameter `options` to `adapter.sanitizeRecord()` to allow passing additional options for sanitization
+- [2.35.0] Change `options.i18n` to `options.intl` in `adapter.sanitizeRecord()` for consistency with other methods
+
+## 2026-07-28
+
+- [2.34.1] Bug fix in `adapter.sanitizeRecord()`
+
 ## 2026-07-26
 
 - [2.34.0] Add `options.i18n` to `model.sanitizeRecord()`