dobo 2.8.3 → 2.9.0

package/lib/factory/connection.js

@@ -35,6 +35,7 @@ async function connectionFactory () {
        * @type {Object}
        */
       this.options = omit(options, ['name', 'driver'])
+      this.options.connName = options.name
       this.options.models = this.options.models ?? []
     }
 

package/lib/factory/driver.js

@@ -36,7 +36,8 @@ async function driverFactory () {
         },
         search: false,
         uniqueIndex: false,
-        nullableField: true
+        nullableField: true,
+        transaction: false
       }
       this.useUtc = false
       this.maxChunkSize = 500
@@ -443,6 +444,10 @@ async function driverFactory () {
     async createHistogram (model, filter = {}, params = {}, options = {}) {
       throw this.plugin.error('notSupported%s%s', this.app.t('method'), 'createHistogram')
     }
+
+    async transaction (model, handler, ...args) {
+      throw this.plugin.error('notSupported%s%s', this.app.t('method'), 'transaction')
+    }
   }
 
   this.app.baseClass.DoboDriver = DoboDriver

package/lib/factory/model/_util.js

@@ -1,6 +1,17 @@
 import path from 'path'
 import nql from '@tryghost/nql'
 
+export const omittedOptionsKeys = ['req', 'reply', 'trx']
+
+export function cloneOptions (options = {}) {
+  const { cloneDeep, omit } = this.app.lib._
+  const nOptions = cloneDeep(omit(options, omittedOptionsKeys))
+  for (const key of omittedOptionsKeys) {
+    nOptions[key] = options[key]
+  }
+  return nOptions
+}
+
 export async function execHook (name, ...args) {
   const { runHook } = this.app.bajo
   const { camelCase, last } = this.app.lib._
@@ -36,10 +47,10 @@ export async function execDynHook (name, ...args) {
 
 export async function execValidation (body, options = {}) {
   const { uniq } = this.app.lib._
-  const { validation = {}, extFields = [], partial, req } = options
+  const { validation = {} } = options
   const fields = uniq([...Object.keys(body), ...(options.fields ?? [])])
   await execHook.call(this, 'beforeRecordValidation', body, options)
-  const result = await this.validate(body, validation, { fields, extFields, partial, req })
+  const result = await this.validate(body, validation, { fields, ...options })
   await execHook.call(this, 'afterRecordValidation', body, result, options)
   return result
 }
@@ -51,18 +62,14 @@ export async function execValidation (body, options = {}) {
  * @returns {Object}
  */
 export async function getFilterAndOptions (filter = {}, options = {}, action) {
-  const { cloneDeep, omit } = this.app.lib._
+  const { cloneDeep } = this.app.lib._
   const { runModelHook } = this.app.dobo
-  const omittedKeys = ['req', 'reply']
-  const nFilter = cloneDeep(omit(filter, omittedKeys))
-  const nOptions = cloneDeep(omit(options, omittedKeys))
+  const nFilter = cloneDeep(filter || {})
+  const nOptions = cloneOptions.call(this, options)
   nOptions.action = action
   nOptions.dataOnly = false
   nOptions.truncateString = nOptions.truncateString ?? false
   nOptions.throwNotFound = nOptions.throwNotFound ?? true
-  for (const key of omittedKeys) {
-    nOptions[key] = options[key]
-  }
   nFilter.orgQuery = nFilter.query
   nFilter.orgSearch = nFilter.search
   if (!nOptions.noModelHook) await runModelHook(this, 'beforeBuildQuery', nFilter.query, nOptions)

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

@@ -20,7 +20,7 @@ async function createRecord (...args) {
   if (!noValidation) await execValidation.call(this, input, options)
   let result = options.record ?? (await this.driver._createRecord(this, input, options)) ?? {}
   if (noResult) {
-    await runHook('cache:clear', this, 'create', body)
+    await runHook('cache:clear', this, 'create', body, null, options)
     return
   }
   result = result ?? {}
@@ -30,7 +30,7 @@ async function createRecord (...args) {
   await execDynHook.call(this, 'afterCreateRecord', input, result, options)
   await execModelHook.call(this, 'afterCreateRecord', input, result, options)
   await execHook.call(this, 'afterCreateRecord', input, result, options)
-  await runHook('cache:clear', this, 'create', body, result)
+  await runHook('cache:clear', this, 'create', body, result, options)
   return dataOnly ? result.data : result
 }
 

package/lib/factory/model/find-all-record.js

@@ -1,4 +1,4 @@
-import { getMultiRefs, execHook, execModelHook, execDynHook, getFilterAndOptions } from './_util.js'
+import { getMultiRefs, execHook, execModelHook, execDynHook, getFilterAndOptions, cloneOptions } from './_util.js'
 const action = 'findAllRecord'
 
 async function native (filter, options, dataOnly) {
@@ -36,8 +36,8 @@ async function loop (params, opts, dataOnly) {
   const { cloneDeep } = this.app.lib._
   const { filter, options } = await getFilterAndOptions.call(this, params, opts, action)
   const { maxLimit, hardLimit } = this.app.dobo.config.default.filter
-  const nFilter = cloneDeep(filter)
-  const nOptions = cloneDeep(options)
+  const nFilter = cloneDeep(filter || {})
+  const nOptions = cloneOptions.call(this, options)
   nOptions.count = false
   nOptions.dataOnly = false
   nFilter.limit = maxLimit

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

@@ -7,7 +7,7 @@ async function findAttachment (...args) {
   const [id, opts = {}] = args
   const { fastGlob, fs } = this.app.lib
   const { getPluginDataDir } = this.app.bajo
-  const dir = `${getPluginDataDir(this.ns)}/attachment/${this.name}/${id}`
+  const dir = `${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/find-one-record.js

@@ -1,3 +1,5 @@
+import { cloneOptions } from './_util.js'
+
 const action = 'findOneRecord'
 
 async function findOneRecord (...args) {
@@ -6,8 +8,8 @@ async function findOneRecord (...args) {
   const { cloneDeep } = this.app.lib._
   const { dataOnly = true } = opts
   if (dataOnly) opts.count = false
-  const nFilter = cloneDeep(params)
-  const nOptions = cloneDeep(opts)
+  const nFilter = cloneDeep(params || {})
+  const nOptions = cloneOptions.call(this, opts)
   nOptions.count = false
   nOptions.dataOnly = false
   nFilter.limit = 1

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

@@ -98,7 +98,7 @@ async function findRecord (...args) {
   await execDynHook.call(this, 'afterFindRecord', filter, result, options)
   await execModelHook.call(this, 'afterFindRecord', filter, result, options)
   await execHook.call(this, 'afterFindRecord', filter, result, options)
-  if (!noCache) await runHook('cache:setByFilter', this, filter, result)
+  if (!noCache) await runHook('cache:setByFilter', this, filter, result, options)
   return dataOnly ? result.data : result
 }
 

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

@@ -74,7 +74,7 @@ async function getRecord (...args) {
   await execDynHook.call(this, 'afterGetRecord', id, result, options)
   await execModelHook.call(this, 'afterGetRecord', id, result, options)
   await execHook.call(this, 'afterGetRecord', id, result, options)
-  if (!noCache) await runHook('cache:setById', this, id, result)
+  if (!noCache) await runHook('cache:setById', this, id, result, options)
   return dataOnly ? result.data : result
 }
 

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

@@ -54,7 +54,7 @@ async function removeRecord (...args) {
   await execDynHook.call(this, 'afterRemoveRecord', id, result, options)
   await execModelHook.call(this, 'afterRemoveRecord', id, result, options)
   await execHook.call(this, 'afterRemoveRecord', id, result, options)
-  await runHook('cache:clear', this, 'remove', id, result)
+  await runHook('cache:clear', this, 'remove', id, result, options)
   return dataOnly ? result.oldData : result
 }
 

package/lib/factory/model/transaction.js

@@ -0,0 +1,6 @@
+async function transaction (handler, ...args) {
+  if (!this.driver.support.transaction) return handler.call(this, ...args)
+  return await this.driver.transaction(this, handler, ...args)
+}
+
+export default transaction

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

@@ -76,7 +76,7 @@ async function updateRecord (...args) {
   await execDynHook.call(this, 'afterUpdateRecord', id, input, result, options)
   await execModelHook.call(this, 'afterUpdateRecord', id, input, result, options)
   await execHook.call(this, 'afterUpdateRecord', id, input, result, options)
-  await runHook('cache:clear', this, 'update', id, body, result)
+  await runHook('cache:clear', this, 'update', id, body, result, options)
   return dataOnly ? result.data : result
 }
 

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

@@ -25,7 +25,7 @@ async function native (body = {}, opts = {}) {
   await execDynHook.call(this, 'afterUpsertRecord', input, result, options)
   await execModelHook.call(this, 'afterUpsertRecord', input, result, options)
   await execHook.call(this, 'afterUpsertRecord', input, result, options)
-  await runHook('cache:clear', this, 'upsert', body, result)
+  await runHook('cache:clear', this, 'upsert', body, result, options)
   return dataOnly ? result.data : result
 }
 

package/lib/factory/model.js

@@ -25,6 +25,7 @@ import sanitizeId from './model/sanitize-id.js'
 import upsertRecord from './model/upsert-record.js'
 import bulkCreateRecords from './model/bulk-create-records.js'
 import listAttachment from './model/list-attachment.js'
+import transaction from './model/transaction.js'
 import validate from './model/validate.js'
 
 /**
@@ -109,6 +110,7 @@ async function modelFactory () {
     findOneRecord = findOneRecord
     findAllRecord = findAllRecord
 
+    transaction = transaction
     bulkCreateRecords = bulkCreateRecords
 
     createAggregate = createAggregate

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
+## 2026-03-05
+
+- [2.9.0] Add transaction support with ```model.transaction()``` wrapper
+- [2.9.0] Add property ```driver.support.transaction``` to indicate a driver is fully support transaction or not
+- [2.9.0] Add property ```connection.options.connName```
+
 ## 2026-02-25
 
 - [2.8.3] Bug fix on attachment route