dobo 2.22.1 → 2.24.0

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

@@ -1,7 +1,7 @@
 const action = 'getAttachment'
 
 async function getAttachment (...args) {
-  if (!this.attachment) return
+  if (!this.options.attachment) return
   if (args.length === 0) return this.action(action, ...args)
   let [id, field, file, opts = {}] = args
   const { find } = this.app.lib._

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook, getSingleRef } from './_util.js'
+import { getFilterAndOptions, execHook, execModelHook, execDynHook, getRefs } from './_util.js'
 const action = 'getRecord'
 
 /**
@@ -68,7 +68,7 @@ async function getRecord (...args) {
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (isEmpty(result.data) && !options.throwNotFound) return dataOnly ? undefined : { data: undefined }
-  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
+  if (isSet(options.refs)) await getRefs.call(this, [result.data], options)
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await execDynHook.call(this, 'afterGetRecord', id, result, options)
   await execModelHook.call(this, 'afterGetRecord', id, result, options)

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

@@ -2,7 +2,7 @@ import path from 'path'
 const action = 'listAttachment'
 
 async function listAttachment (...args) {
-  if (!this.attachment) return
+  if (!this.options.attachment) return
   if (args.length === 0) return this.action(action, ...args)
   const [params = {}, opts = {}] = args
   const { map, kebabCase } = this.app.lib._

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

@@ -26,25 +26,39 @@ async function exec ({ item, spinner, options, result, items } = {}) {
 
 async function loadFixtures ({ spinner, ignoreError = true, collectItems = false, noLookup = false } = {}, options = {}) {
   const { readConfig } = this.app.bajo
-  const { resolvePath } = this.app.lib.aneka
-  const { isEmpty } = this.app.lib._
+  const { resolvePath, isSet } = this.app.lib.aneka
+  const { isEmpty, isString, isArray } = this.app.lib._
   if (this.connection.proxy) {
     this.log.warn('proxiedConnBound%s', this.name)
     return
   }
   const result = { success: 0, failed: 0 }
-  const base = path.basename(this.file, path.extname(this.file))
-  const pattern = resolvePath(`${path.dirname(this.file)}/../fixture/${base}.*`)
+  const base = path.basename(this.options.file, path.extname(this.options.file))
+  const pattern = resolvePath(`${path.dirname(this.options.file)}/../fixture/${base}.*`)
   const items = await readConfig(pattern, { ns: this.plugin.ns, baseNs: 'dobo', checkOverride: true, defValue: [] })
   const opts = { ...options, noMagic: true }
   for (const item of items) {
-    for (const k in item) {
-      const v = item[k]
-      if (!noLookup && typeof v === 'string' && v.slice(0, 2) === '?:') item[k] = await this._simpleLookup(v.slice(2), opts)
-      if (v === null) item[k] = undefined
+    const lv = {}
+    for (const key in item) {
+      const val = item[key]
+      if (!noLookup) {
+        if (isString(val) && val.slice(0, 2) === '?:') {
+          item[key] = await this._simpleLookup(val.slice(2), lv, opts)
+          lv[key] = item[key]
+        } else if (isArray(val)) {
+          for (const idx in val) {
+            if (isString(val[idx]) && val[idx].slice(0, 2) === '?:') {
+              item[key][idx] = await this._simpleLookup(val[idx].slice(2), lv, opts)
+              if (isSet(item[key][idx])) item[key][idx] += ''
+              lv[`${key}.${idx}`] = item[key][idx]
+            }
+          }
+        }
+      }
+      if (val === null) item[key] = undefined
       else {
-        const prop = this.properties.find(item => item.name === k)
-        if (prop && ['string', 'text'].includes(prop.type)) item[k] += ''
+        const prop = this.properties.find(item => item.name === key)
+        if (prop && ['string', 'text'].includes(prop.type)) item[key] += ''
       }
     }
   }

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

@@ -3,7 +3,7 @@ import path from 'path'
 const action = 'removeAttachment'
 
 async function removeAttachment (...args) {
-  if (!this.attachment) return
+  if (!this.options.attachment) return
   if (args.length === 0) return this.action(action, ...args)
   const [id, field, file, opts = {}] = args
   const { fs, fastGlob } = this.app.lib

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook, getSingleRef, handleReq, clearCache } from './_util.js'
+import { getFilterAndOptions, execHook, execModelHook, execDynHook, getRefs, handleReq, clearCache } from './_util.js'
 const action = 'removeRecord'
 
 /**
@@ -51,7 +51,7 @@ async function removeRecord (...args) {
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (!noResultSanitizer) result.oldData = await this.sanitizeRecord(result.oldData, options)
-  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
+  if (isSet(options.refs)) await getRefs.call(this, [result.data], options)
   await execDynHook.call(this, 'afterRemoveRecord', id, result, options)
   await execModelHook.call(this, 'afterRemoveRecord', id, result, options)
   await execHook.call(this, 'afterRemoveRecord', id, result, options)

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

@@ -33,12 +33,16 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
 
   const omitted = []
   const details = []
-  for (const prop of [...this.properties, ...extFields]) {
+  const properties = [...this.properties, ...extFields]
+  for (const prop of properties) {
     try {
-      if (partial && !has(body, prop.name)) continue
+      if (partial && !has(body, prop.name)) {
+        if (prop.type === 'array') result[prop.name] = null
+        continue
+      }
       result[prop.name] = body[prop.name]
-      if (body[prop.name] === null) continue
-      if (isSet(body[prop.name])) sanitize(prop.name, prop.type)
+      if (prop.type === 'array' && isSet(result[prop.name]) && !Array.isArray(result[prop.name])) result[prop.name] = [result[prop.name]]
+      if (isSet(result[prop.name])) sanitize(prop.name, prop.type)
       else {
         if (isSet(prop.default) && !noDefault) {
           result[prop.name] = prop.default
@@ -48,9 +52,10 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
           } else sanitize(prop.name, prop.type)
         }
       }
+      if (result[prop.name] === null) continue
       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 (prop.name.endsWith('Id') && isSet(result[prop.name]) && prop.type === 'string' && ['smallint', 'integer'].includes(this.driver.idField.type)) result[prop.name] = result[prop.name] + ''
+      if (result[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 } })
     }

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

@@ -24,7 +24,7 @@ async function sanitizeRecord (record = {}, opts = {}) {
   if (!newFields.includes('id')) newFields.unshift('id')
   newFields = without(newFields, ...allHidden)
   const body = fillObject(record, newFields, null)
-  const newRecord = await this.sanitizeBody({ body, noDefault: true })
+  const newRecord = await this.sanitizeBody({ body, partial: true, noDefault: true })
   if (record._ref) newRecord._ref = cloneDeep(record._ref)
   for (const key in newRecord) {
     const prop = this.getProperty(key)
@@ -35,6 +35,7 @@ async function sanitizeRecord (record = {}, opts = {}) {
   }
   if (opts.fmt) {
     newRecord._fmt = cloneDeep(newRecord)
+    delete newRecord._fmt._ref
     for (const key in newRecord) {
       const prop = this.getProperty(key)
       if (!prop) continue

package/lib/factory/model/transaction.js

@@ -1,6 +1,15 @@
 async function transaction (handler, ...args) {
   if (!this.driver.support.transaction) return handler.call(this, ...args)
-  return await this.driver.transaction(this, handler, ...args)
+
+  const { ns } = this.app.dobo
+  const { camelCase } = this.app.lib._
+  const { runHook } = this.app.bajo
+  const name = 'afterTransaction'
+  const result = await this.driver.transaction(this, handler, ...args)
+  const [action, ...params] = args
+  await runHook(`${ns}:${name}`, this.name, action, result, ...params)
+  await runHook(`${ns}.${camelCase(this.name)}:${name}`, action, result, ...params)
+  return result
 }
 
 export default transaction

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execValidation, execModelHook, execDynHook, getSingleRef, handleReq, clearCache } from './_util.js'
+import { getFilterAndOptions, execHook, execValidation, execModelHook, execDynHook, getRefs, handleReq, clearCache } from './_util.js'
 import { onlyTypes } from './create-record.js'
 const action = 'updateRecord'
 
@@ -66,13 +66,13 @@ async function updateRecord (...args) {
   await execModelHook.call(this, 'beforeUpdateRecord', id, input, options)
   await execDynHook.call(this, 'beforeUpdateRecord', id, input, options)
   if (!noValidation) await execValidation.call(this, input, options)
-  const result = options.record ?? (await this.driver._updateRecord(this, id, input, options)) ?? {}
+  const result = await this.driver._updateRecord(this, id, input, options)
   await handleReq.call(this, result.data.id, 'updated', options)
   await clearCache.call(this, id)
   if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
-  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
+  if (isSet(options.refs)) await getRefs.call(this, [result.data], options)
   if (!noResultSanitizer) {
     result.data = await this.sanitizeRecord(result.data, options)
     result.oldData = await this.sanitizeRecord(result.oldData, options)

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook, execValidation, getSingleRef, handleReq, clearCache } from './_util.js'
+import { getFilterAndOptions, execHook, execModelHook, execDynHook, execValidation, getRefs, handleReq, clearCache } from './_util.js'
 const action = 'upsertRecord'
 
 async function native (body = {}, opts = {}) {
@@ -21,7 +21,7 @@ async function native (body = {}, opts = {}) {
   if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
-  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
+  if (isSet(options.refs)) await getRefs.call(this, [result.data], options)
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await execDynHook.call(this, 'afterUpsertRecord', input, result, options)
   await execModelHook.call(this, 'afterUpsertRecord', input, result, options)

package/lib/factory/model.js

@@ -23,7 +23,7 @@ import sanitizeBody from './model/sanitize-body.js'
 import sanitizeRecord from './model/sanitize-record.js'
 import sanitizeId from './model/sanitize-id.js'
 import upsertRecord from './model/upsert-record.js'
-import bulkCreateRecords from './model/bulk-create-records.js'
+import bulkCreateRecord from './model/bulk-create-record.js'
 import listAttachment from './model/list-attachment.js'
 import transaction from './model/transaction.js'
 import validate from './model/validate.js'
@@ -109,7 +109,17 @@ async function modelFactory () {
       return !!this.getProperty(name)
     }
 
-    _simpleLookup = async (value, options = {}) => {
+    syncIdField = (idField) => {
+      const { cloneDeep, findIndex } = this.app.lib._
+      if (!this.driver) return
+      if (!idField) idField = cloneDeep(this.driver.idField)
+      const idx = findIndex(this.properties, { name: 'id' })
+      if (idx === -1) return
+      this.properties.splice(idx, 1)
+      this.properties.unshift(idField)
+    }
+
+    _simpleLookup = async (value, lookupValue, options = {}) => {
       const { get, isEmpty, isString, isPlainObject, isArray } = this.app.lib._
       let model
       let field
@@ -120,10 +130,13 @@ async function modelFactory () {
       } else if (isPlainObject(value)) ({ model, field, query } = value)
       else if (isArray(value)) [model, field, query] = value
       else return
+      for (const key in lookupValue) {
+        query = query.replaceAll(`{${key}}`, lookupValue[key])
+      }
       if (isEmpty(field)) field = 'id'
       const { getModel } = this.app.dobo
       const ref = getModel(model)
-      const opts = { noHook: true, noCache: true, ...options }
+      const opts = { ...options, noCache: true, noMagic: true }
       opts.dataOnly = true
       const rec = await ref.findOneRecord({ query }, opts)
       return get(rec, field, null)
@@ -144,7 +157,7 @@ async function modelFactory () {
     findAllRecord = findAllRecord
 
     transaction = transaction
-    bulkCreateRecords = bulkCreateRecords
+    bulkCreateRecord = bulkCreateRecord
 
     createAggregate = createAggregate
     createHistogram = createHistogram
@@ -170,6 +183,7 @@ async function modelFactory () {
     findRecords = findRecord
     findAllRecords = findAllRecord
     listAttachments = listAttachment
+    bulkCreateRecords = bulkCreateRecord
 
     getField = (name) => this.getProperty(name)
     hasField = (name) => this.hasProperty(name)
@@ -182,7 +196,6 @@ async function modelFactory () {
   }
 
   this.app.baseClass.DoboModel = DoboModel
-  return DoboModel
 }
 
 export default modelFactory

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,35 @@
 # Changes
 
+## 2026-05-16
+
+- [2.24.0] Change ```dobo:immutable``` feature, field no longer hidden
+- [2.24.0] Add ```dobo:[before|after]Driver<Action>``` hook
+- [2.24.0] Add ```dobo.<modelName>:[before|after]Driver<Action>``` hook
+- [2.24.0] Change ```model._simpleLookup()```
+- [2.24.0] Remove ```dobo:[before|after]Build[Query|Search]``` hook
+- [2.24.0] Change ```model.loadFixtures()```
+- [2.24.0] Bugfix in ```model.sanitizeBody()```
+- [2.24.0] Add ```dobo:afterTransaction``` hook
+- [2.24.0] Add ```dobo.<modelName>:afterTransaction``` hook
+
+## 2026-05-11
+
+- [2.23.0] Add ```beforeBulkCreate``` model hook on ```dobo:unique``` feature
+- [2.23.0] Add ```beforeBulkCreate``` model hook on ```dobo:updatedAt``` feature
+- [2.23.0] Add ```beforeBulkCreate``` model hook on ```dobo:unique``` feature
+- [2.23.0] Add ```connection.initDriver()```
+- [2.23.0] Move ```model.file``` in model definition to ```model.options.file```
+- [2.23.0] Move ```model.attachment``` in model definition to ```model.options.attachment```
+- [2.23.0] Add ```model.buildStart()``` and ```model.buildEnd()``` in model definition
+- [2.23.0] Add ```null``` driver
+- [2.23.0] Add ```model.syncIdField()```
+- [2.23.0] Rename method to ```model.bulkCreateRecord``` instead ```bulkCreateRecords```. The later name now serve only as alias
+- [2.23.0] Remove ```getSingleRef()``` and ```getMultiRefs()```, use ```getRefs()``` instead
+- [2.23.0] Add reference support for ```array``` column type
+- [2.23.0] Bug fix in ```model.findAllRecord()```, now use correctly hook names
+- [2.23.0] Bug fix in ```model.sanitizeBody()```
+- [2.23.0] Bug fix in ```model.sanitizeRecord()```
+
 ## 2026-05-03
 
 - [2.22.1] Bug fix in ```dobo:image``` feature
@@ -87,7 +117,7 @@
 - [2.16.0] Rewrite ```getDefaultValues()``` to base on ```req.getSetting()```
 - [2.16.0] All inter site admins are now exempts from ```immutable``` row
 - [2.16.0] Bug fix in ```collect-models.js```
-- [2.16.0] Bug fix in ```getSingleRef()``` and ```getMultiRefs()```
+- [2.16.0] Bug fix in ```getRefs()``` and ```getRefs()```
 - [2.16.0] Add feature to return formatted row(s) with ```options.formatValue```
 - [2.16.0] If row is formatted, add feature to save original row in ```_orig``` with ```options.retainOriginalValue```
 
@@ -121,7 +151,7 @@
 
 ## 2026-03-26
 
-- [2.11.4] Exceptions thrown in ```getSingleRef()``` && ```getMultiRefs()``` will be catched and are ignored
+- [2.11.4] Exceptions thrown in ```getRefs()``` && ```getRefs()``` will be catched and are ignored
 
 ## 2026-03-25
 
@@ -226,7 +256,7 @@
 
 ## 2026-01-29
 
-- [2.4.0] Add ```bulkCreateRecords()``` on model & driver
+- [2.4.0] Add ```bulkCreateRecord()``` on model & driver
 - [2.4.0] Add ```execModelHook()```
 - [2.4.0] Bug fix in models collection
 - [2.4.0] Add ```DoboAction``` to the ```app.baseClass```