dobo 2.17.0 → 2.18.0

package/extend/bajo/intl/en-US.json

@@ -149,6 +149,7 @@
   "hardCapWarning%s%s": "Max records returned (%s rows) above the allowed threshold (%s rows)",
   "maxPageError%s%s": "Page number (%s) above the allowed threshold (%s)",
   "duplicateRefKeys%s%s": "Duplicate reference keys found in '%s' (%s)",
+  "sanitizeBodyError": "Error sanitizing body",
   "field": {
     "id": "ID",
     "code": "Kode",

package/extend/bajo/intl/id.json

@@ -147,6 +147,7 @@
   "hardCapWarning%s%s": "Maksimum data yang dihasilkan (%s baris) melampaui batas yang diijinkan (%s baris)",
   "maxPageError%s%s": "Nomor halaman (%s) melampaui batas yang diijinkan (%s)",
   "duplicateRefKeys%s%s": "Ditemukan kunci referensi duplikat di '%s' (%s)",
+  "sanitizeBodyError": "Kesalahan saat sanitasi body",
   "field": {
     "id": "ID",
     "code": "Kode",

package/extend/dobo/feature/dt.js

@@ -1,12 +1,30 @@
 async function dt (opts = {}) {
   opts.field = opts.field ?? 'dt'
+  opts.type = opts.type ??'datetime'
+  opts.formatInt = opts.formatInt ?? false
+  opts.formatValueInt = opts.formatValueInt ?? false
+  const prop = {
+    name: opts.field ?? 'dt',
+    type: opts.type,
+    required: opts.required ?? true,
+    index: opts.index ?? true
+  }
+  if (opts.type === 'integer') {
+    if (opts.formatInt) {
+      prop.format = async function (val, data, { req } = {}) {
+        const dt = new Date(data._orig[opts.field])
+        return req ? req.format(dt, 'datetime') : this.app.bajo.format(dt, 'datetime', { lang: req.lang })
+      }
+    }
+    if (opts.formatValueInt) {
+      prop.format = async function (val, data, { req } = {}) {
+        return new Date(data._orig[opts.field])
+      }
+    }
+  }
+
   return {
-    properties: [{
-      name: opts.field ?? 'dt',
-      type: 'datetime',
-      required: opts.required ?? true,
-      index: opts.index ?? true
-    }]
+    properties: [prop]
   }
 }
 

package/index.js

@@ -390,7 +390,7 @@ async function factory (pkgName) {
       return parseInt(value) || null
     }
 
-    sanitizeObject = (value, { strict = false } = {}) => {
+    sanitizeObject = (value, { strict = false, action, model } = {}) => {
       const { isString } = this.app.lib._
       let result = null
       if (isString(value)) {

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

@@ -1,6 +1,6 @@
 import { getFilterAndOptions, execHook, execValidation, execModelHook, execDynHook, getSingleRef, handleReq } from './_util.js'
 
-export const onlyTypes = ['datetime', 'date', 'time', 'timestamp']
+export const onlyTypes = ['datetime', 'date', 'time', 'timestamp', 'array', 'object']
 const action = 'createRecord'
 
 async function createRecord (...args) {
@@ -14,7 +14,7 @@ async function createRecord (...args) {
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   const { truncateString, noResult, noBodySanitizer, noResultSanitizer, noValidation } = options
   const extFields = get(options, 'validation.extFields', [])
-  const input = noBodySanitizer ? cloneDeep(body) : await this.sanitizeBody({ body, extFields, strict: true, truncateString, onlyTypes })
+  const input = noBodySanitizer ? cloneDeep(body) : await this.sanitizeBody({ body, extFields, strict: true, truncateString, onlyTypes, action })
   await execHook.call(this, 'beforeCreateRecord', input, options)
   await execModelHook.call(this, 'beforeCreateRecord', input, options)
   await execDynHook.call(this, 'beforeCreateRecord', input, options)

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

@@ -21,7 +21,7 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
 
   const sanitize = (name, type) => {
     if (onlyTypes.length > 0 && !onlyTypes.includes(type)) return
-    if (['object', 'array'].includes(type)) result[name] = sanitizeObject(result[name], { strict })
+    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 })
@@ -32,23 +32,32 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
   }
 
   const omitted = []
+  const details = []
   for (const prop of [...this.properties, ...extFields]) {
-    if (partial && !has(body, prop.name)) continue
-    result[prop.name] = body[prop.name]
-    if (body[prop.name] === null) continue
-    if (isSet(body[prop.name])) sanitize(prop.name, prop.type)
-    else {
-      if (isSet(prop.default) && !noDefault) {
-        result[prop.name] = prop.default
-        if (isString(prop.default) && prop.default.startsWith('handler:')) {
-          const [, ...args] = prop.default.split(':')
-          if (args.length > 0) result[prop.name] = await callHandler(args.join(':'))
-        } else sanitize(prop.name, prop.type)
+    try {
+      if (partial && !has(body, prop.name)) continue
+      result[prop.name] = body[prop.name]
+      if (body[prop.name] === null) continue
+      if (isSet(body[prop.name])) sanitize(prop.name, prop.type)
+      else {
+        if (isSet(prop.default) && !noDefault) {
+          result[prop.name] = prop.default
+          if (isString(prop.default) && prop.default.startsWith('handler:')) {
+            const [, ...args] = prop.default.split(':')
+            if (args.length > 0) result[prop.name] = await callHandler(args.join(':'))
+          } else sanitize(prop.name, prop.type)
+        }
       }
+      if (truncateString && isSet(result[prop.name]) && ['string', 'text'].includes(prop.type)) result[prop.name] = result[prop.name].slice(0, prop.maxLength)
+      if (prop.name.endsWith('Id') && prop.type === 'string' && ['smallint', 'integer'].includes(this.driver.idField.type)) result[prop.name] = result[prop.name] + ''
+      if (body[prop.name] === undefined) omitted.push(prop.name)
+    } catch (err) {
+      details.push({ field: prop.name, error: err.message, value: body[prop.name], ext: { type: prop.type } })
     }
-    if (truncateString && isSet(result[prop.name]) && ['string', 'text'].includes(prop.type)) result[prop.name] = result[prop.name].slice(0, prop.maxLength)
-    if (prop.name.endsWith('Id') && prop.type === 'string' && ['smallint', 'integer'].includes(this.driver.idField.type)) result[prop.name] = result[prop.name] + ''
-    if (body[prop.name] === undefined) omitted.push(prop.name)
+  }
+  if (details.length > 0) {
+    const payload = { details, statusCode: 422, code: 'BODY_SANITIZATION', model: this.name }
+    throw this.plugin.error('sanitizeBodyError', payload)
   }
   return omit(result, omitted)
 }

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

@@ -29,6 +29,11 @@ async function sanitizeRecord (record = {}, opts = {}) {
       const prop = this.getProperty(key)
       if (!prop) continue
       const value = ['object', 'array'].includes(prop.type) ? cloneDeep(newRecord[key]) : newRecord[key]
+      if (prop.formatValue && opts.retainOriginalValue) {
+        const value = ['object', 'array'].includes(prop.type) ? cloneDeep(newRecord._orig[key]) : newRecord._orig[key]
+        if (isFunction(prop.formatValue)) newRecord._orig[key] = await prop.formatValue.call(this, value, newRecord._orig, opts)
+        else if (isString(prop.formatValue)) newRecord._orig[key] = await callHandler(this.plugin, this, value, newRecord._orig, opts)
+      }
       if (prop.format) {
         if (isFunction(prop.format)) newRecord[key] = await prop.format.call(this, value, newRecord, opts)
         else if (isString(prop.format)) newRecord[key] = await callHandler(this.plugin, this, value, newRecord, opts)

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

@@ -58,7 +58,7 @@ async function updateRecord (...args) {
   const extFields = get(options, 'validation.extFields', [])
   id = this.sanitizeId(id)
 
-  let input = noBodySanitizer ? cloneDeep(body) : await this.sanitizeBody({ body, extFields, strict: true, truncateString, partial, onlyTypes })
+  let input = noBodySanitizer ? cloneDeep(body) : await this.sanitizeBody({ body, extFields, strict: true, truncateString, partial, onlyTypes, action })
   const immutables = this.properties.filter(prop => prop.immutable)
   if (immutables.length > 0) input = omit(input, immutables)
   delete input.id

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

@@ -10,7 +10,7 @@ async function native (body = {}, opts = {}) {
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   const { truncateString, noResult, noBodySanitizer, noResultSanitizer, noValidation } = options
   const extFields = get(options, 'validation.extFields', [])
-  let input = noBodySanitizer ? cloneDeep(body) : await this.sanitizeBody({ body, extFields, strict: true, truncateString })
+  let input = noBodySanitizer ? cloneDeep(body) : await this.sanitizeBody({ body, extFields, strict: true, truncateString, action })
   if (!noValidation) input = await execValidation.call(this, input, options)
   await execHook.call(this, 'beforeUpsertRecord', input, options)
   await execModelHook.call(this, 'beforeUpsertRecord', input, options)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-04-16
+
+- [2.18.0] Add parameter options to ```sanitizeObject()```
+- [2.18.0] Rewrite ```dobo:dt``` feature to support customization
+- [2.18.0] Bug fix in ```model.createRecord()```
+- [2.18.0] Changes in ```model.sanitizeBody()``` to throw error with payload details
+- [2.18.0] Changes in ```model.sanitizeRecord()``` to support ```options.retainOriginalValue```
+- [2.18.0] Bug fix in ```model.updateRecord()```
+- [2.18.0] Bug fix in ```model.upsertRecord()```
+
 ## 2026-04-13
 
 - [2.17.0] Add ```{ strict }``` as parameter to ```sanitizeObject()```