dobo 2.19.0 → 2.20.0

package/lib/collect-models.js

@@ -238,7 +238,7 @@ async function createSchema (item) {
   const { readConfig } = this.app.bajo
   const { fastGlob } = this.app.lib
   const { find, isPlainObject, orderBy, get, cloneDeep } = this.app.lib._
-  const { mergeObjectsByKey, defaultsDeep } = this.app.lib.aneka
+  const { mergeObjectsByKey, defaultsDeep, parseObject } = this.app.lib.aneka
   if (item.file && !item.base) item.base = path.basename(item.file, path.extname(item.file))
   item.attachment = item.attachment ?? true
   const feats = item.features ?? []
@@ -269,7 +269,7 @@ async function createSchema (item) {
   item.cache = item.cache ?? item.connection.options.cache ?? defCache
   if (item.cache === true) item.cache = get(item, 'connection.options.cache', defCache)
   else if (item.cache === false) item.cache = { ttlDur: 0 }
-  item.cache = defaultsDeep(get(this, `app.bajoCache.config.dobo.${item.name}`), item.cache)
+  item.cache = parseObject(defaultsDeep(get(this, `app.bajoCache.config.dobo.${item.name}`), item.cache))
   await findAllProps.call(this, item, props, indexes)
   await findAllFeats.call(this, item, feats, indexes)
   await findAllIndexes.call(this, item, indexes)

package/lib/factory/model/_util.js

@@ -65,6 +65,16 @@ export async function getFilterAndOptions (filter = {}, options = {}, action) {
   const { runModelHook } = this.app.dobo
   const nFilter = cloneDeep(filter || {})
   const nOptions = cloneOptions.call(this, options)
+  if (options.noMagic) {
+    nOptions.noModelHook = true
+    nOptions.noHook = true
+    nOptions.noDynHook = true
+    nOptions.noValidation = true
+    nOptions.noCache = true
+    nOptions.throwNotFound = false
+    delete options.noMagic
+    delete nOptions.noMagic
+  }
   nOptions.action = action
   nOptions.dataOnly = false
   nOptions.truncateString = nOptions.truncateString ?? false
@@ -420,3 +430,12 @@ export function preparePagination (filter = {}, options = {}) {
   const sort = buildSort(sortInput, options.allowSortUnindexed)
   return { limit, page, skip, sort }
 }
+
+export async function clearCache (id) {
+  const { clear } = this.app.bajoCache
+  if (!clear) return
+  await clear({ key: `dobo|${this.name}|getRecord|${id}` })
+  await clear({ key: `dobo|${this.name}|findRecord` })
+  await clear({ key: `dobo|${this.name}|findAllRecord` })
+  await clear({ key: `dobo|${this.name}|findOneRecord` })
+}

package/lib/factory/model/build.js

@@ -2,7 +2,8 @@ import { getFilterAndOptions, execHook, execModelHook } from './_util.js'
 const action = 'build'
 
 async function build (opts = {}) {
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   await execHook.call(this, 'beforeBuildModel', options)
   await execModelHook.call(this, 'beforeBuildModel', options)

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

@@ -4,7 +4,8 @@ const action = 'clearRecord'
 async function clearRecord (...args) {
   if (args.length === 0) return this.action(action, ...args)
   const [opts = {}] = args
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   await execHook.call(this, 'beforeClearRecord', options)
   await execModelHook.call(this, 'beforeClearRecord', options)

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

@@ -5,7 +5,8 @@ async function countRecord (...args) {
   const { getDefaultValues } = this.app.dobo
   if (args.length === 0) return this.action(action, ...args)
   const [params = {}, opts = {}] = args
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { filter, options } = await getFilterAndOptions.call(this, params, opts, action)
   const { hardCap, t } = getDefaultValues(options)
   await execHook.call(this, 'beforeCountRecord', options)

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

@@ -4,7 +4,8 @@ const action = 'createAggregate'
 async function createAggregate (...args) {
   if (args.length === 0) return this.action(action, ...args)
   const [_filter = {}, params = {}, opts = {}] = args
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { filter, options } = await getFilterAndOptions.call(this, _filter, opts, action)
   const { getDefaultValues } = this.app.dobo
   await execHook.call(this, 'beforeCreateAggregate', filter, params, options)

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

@@ -4,7 +4,8 @@ const action = 'createHistogram'
 async function createHistogram (...args) {
   if (args.length === 0) return this.action(action, ...args)
   const [_filter = {}, params = {}, opts = {}] = args
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { filter, options } = await getFilterAndOptions.call(this, _filter, opts, action)
   const { getDefaultValues } = this.app.dobo
   await execHook.call(this, 'beforeCreateHistogram', filter, params, options)

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

@@ -8,9 +8,9 @@ async function createRecord (...args) {
   const [body = {}, opts = {}] = args
   const { getDefaultValues } = this.app.dobo
   const { isSet } = this.app.lib.aneka
-  const { runHook } = this.app.bajo
   const { cloneDeep, get } = this.app.lib._
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   const { truncateString, noResult, noBodySanitizer, noResultSanitizer, noValidation } = options
   const extFields = get(options, 'validation.extFields', [])
@@ -20,10 +20,7 @@ async function createRecord (...args) {
   await execDynHook.call(this, 'beforeCreateRecord', input, options)
   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, null, options)
-    return
-  }
+  if (noResult) return
   result = result ?? {}
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
@@ -33,7 +30,6 @@ 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, options)
   return dataOnly ? result.data : result
 }
 

package/lib/factory/model/drop.js

@@ -2,7 +2,8 @@ import { getFilterAndOptions, execHook, execModelHook } from './_util.js'
 const action = 'drop'
 
 async function drop (opts = {}) {
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   await execHook.call(this, 'beforeDropModel', options)
   await execModelHook.call(this, 'beforeDropModel', options)

package/lib/factory/model/exists.js

@@ -8,7 +8,8 @@ const action = 'modelExists'
  * @returns {Object}
  */
 async function isExists (opts = {}) {
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   await execHook.call(this, 'beforeModelExists', options)
   await execModelHook.call(this, 'beforeModelExists', options)

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

@@ -4,27 +4,24 @@ const action = 'findAllRecord'
 async function native (...args) {
   const { isSet } = this.app.lib.aneka
   const { getDefaultValues, t } = this.app.dobo
-  const { cloneDeep, pick, omit } = this.app.lib._
+  const { pick, omit, cloneDeep } = this.app.lib._
   const [params = {}, opts = {}] = args
-  const { dataOnly = true } = opts
-  const { get: getCache, set: setCache } = this.app.bajoCache ?? {}
+  const { get, set } = this.app.bajoCache ?? {}
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { filter, options } = await getFilterAndOptions.call(this, params, opts, action)
   const { hardCap, warnings } = getDefaultValues(options)
   if (dataOnly) options.count = false
-  let { noResultSanitizer, noCache } = options
+  const { noResultSanitizer } = options
   await execHook.call(this, 'beforeFindRecord', filter, options)
   await execModelHook.call(this, 'beforeFindRecord', filter, options)
   await execDynHook.call(this, 'beforeFindRecord', filter, options)
-  if (this.cache.ttlDur === 0 || options.record) noCache = true
-  const cacheFilter = cloneDeep(filter)
-  if (!noCache && getCache) {
-    const result = await getCache({ model: this, filter: cacheFilter, options })
-    if (result) {
-      for (const idx in result.data) {
-        result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
-      }
-      result.cached = true
-      return dataOnly ? result.data : result
+  const cFilter = cloneDeep(filter)
+  if (get) {
+    const resp = await get({ model: this, action, filter: cFilter, options })
+    if (resp) {
+      resp.cached = true
+      return dataOnly ? resp.data : resp
     }
   }
   let result = options.record ?? (await this.driver._findAllRecord(this, filter, options)) ?? {}
@@ -49,10 +46,7 @@ async function native (...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 && setCache) {
-    await setCache({ model: this, filter: cacheFilter, result, options })
-    result.cached = false
-  }
+  if (set) await set({ model: this, action, filter: cFilter, options, result })
   return dataOnly ? result.data : result
 }
 
@@ -60,7 +54,8 @@ async function loop (...args) {
   const { cloneDeep } = this.app.lib._
   const { getDefaultValues } = this.app.dobo
   const [params = {}, opts = {}] = args
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { filter, options } = await getFilterAndOptions.call(this, params, opts, action)
   const { maxLimit, hardCap, warnings: showWarnings } = getDefaultValues(options)
   const nFilter = cloneDeep(filter || {})

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

@@ -7,7 +7,8 @@ async function findOneRecord (...args) {
   const { getDefaultValues } = this.app.dobo
   const [params = {}, opts = {}] = args
   const { cloneDeep } = this.app.lib._
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   if (dataOnly) opts.count = false
   const nFilter = cloneDeep(params || {})
   const nOptions = cloneOptions.call(this, opts)
@@ -17,7 +18,7 @@ async function findOneRecord (...args) {
   const { warnings } = getDefaultValues(nOptions)
   const resp = await this.findRecord(nFilter, nOptions)
   const data = resp.data[0]
-  const result = { data, cached: resp.cached, warnings: resp.warnings }
+  const result = { data, warnings: resp.warnings }
   if (!warnings) delete result.warnings
   return dataOnly ? data : result
 }

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

@@ -69,32 +69,29 @@ async function findRecord (...args) {
   const { getDefaultValues, t } = this.app.dobo
   const [params = {}, opts = {}] = args
   const { isSet } = this.app.lib.aneka
-  const { cloneDeep, pick, omit } = this.app.lib._
-  const { dataOnly = true } = opts
-  const { get: getCache, set: setCache } = this.app.bajoCache ?? {}
+  const { pick, omit, cloneDeep } = this.app.lib._
+  const { get, set } = this.app.bajoCache ?? {}
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { filter, options } = await getFilterAndOptions.call(this, params, opts, action)
   const { hardCap, warnings } = getDefaultValues(options)
   if (dataOnly) options.count = false
-  let { noResultSanitizer, noCache } = options
+  const { noResultSanitizer } = options
   await execHook.call(this, 'beforeFindRecord', filter, options)
   await execModelHook.call(this, 'beforeFindRecord', filter, options)
   await execDynHook.call(this, 'beforeFindRecord', filter, options)
-  if (this.cache.ttlDur === 0 || options.record) noCache = true
-  const cacheFilter = cloneDeep(filter)
-  if (!noCache && getCache) {
-    const result = await getCache({ model: this, filter: cacheFilter, options })
-    if (result) {
-      for (const idx in result.data) {
-        result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
-      }
-      result.cached = true
-      return dataOnly ? result.data : result
+  const cFilter = cloneDeep(filter)
+  if (get) {
+    const resp = await get({ model: this, action, filter: cFilter, options })
+    if (resp) {
+      resp.cached = true
+      return dataOnly ? resp.data : resp
     }
   }
   let result = options.record ?? (await this.driver._findRecord(this, filter, options)) ?? {}
   result.page = filter.page
   result.limit = filter.limit
-  result.filter = pick(filter, ['query', 'match', 'sort'])
+  result.filter = pick(filter, ['query', 'search', 'sort'])
   result.warnings = result.warnings ?? []
   if (!options.count) result = omit(result, ['count', 'pages'])
   else if (options.count && result.count > hardCap) {
@@ -114,10 +111,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 && setCache) {
-    await setCache({ model: this, filter: cacheFilter, result, options })
-    result.cached = false
-  }
+  if (set) await set({ model: this, action, filter: cFilter, options, result })
   return dataOnly ? result.data : result
 }
 

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

@@ -48,22 +48,20 @@ async function getRecord (...args) {
   const { getDefaultValues } = this.app.dobo
   const { isEmpty } = this.app.lib._
   const { isSet } = this.app.lib.aneka
-  const { get: getCache, set: setCache } = this.app.bajoCache ?? {}
-  const { dataOnly = true } = opts
+  const { get, set } = this.app.bajoCache ?? {}
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
-  let { noResultSanitizer, noCache } = options
-  if (!this.cacheable || !options.record) noCache = true
+  const { noResultSanitizer } = options
   id = this.sanitizeId(id)
   await execHook.call(this, 'beforeGetRecord', id, options)
   await execModelHook.call(this, 'beforeGetRecord', id, options)
   await execDynHook.call(this, 'beforeGetRecord', id, options)
-  if (this.cache.ttlDur === 0 || options.record) noCache = true
-  if (!noCache && getCache) {
-    const result = await getCache({ model: this, id, options })
-    if (result) {
-      result.data = await this.sanitizeRecord(result.data, options)
-      result.cached = true
-      return dataOnly ? result.data : result
+  if (get) {
+    const resp = await get({ model: this, action, id, options })
+    if (resp) {
+      resp.cached = true
+      return dataOnly ? resp.data : resp
     }
   }
   const result = options.record ?? (await this.driver._getRecord(this, id, options)) ?? {}
@@ -75,10 +73,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 && setCache) {
-    await setCache({ model: this, id, result, options })
-    result.cached = false
-  }
+  if (set) await set({ model: this, action, id, options, result })
   return dataOnly ? result.data : result
 }
 

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook, getSingleRef, handleReq } from './_util.js'
+import { getFilterAndOptions, execHook, execModelHook, execDynHook, getSingleRef, handleReq, clearCache } from './_util.js'
 const action = 'removeRecord'
 
 /**
@@ -36,8 +36,8 @@ async function removeRecord (...args) {
   let [id, opts = {}] = args
   const { getDefaultValues } = this.app.dobo
   const { isSet } = this.app.lib.aneka
-  const { runHook } = this.app.bajo
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   const { noResult, noResultSanitizer } = options
   id = this.sanitizeId(id)
@@ -45,10 +45,8 @@ async function removeRecord (...args) {
   await execModelHook.call(this, 'beforeRemoveRecord', id, options)
   await execDynHook.call(this, 'beforeRemoveRecord', id, options)
   const result = options.record ?? (await this.driver._removeRecord(this, id, options)) ?? {}
-  if (noResult) {
-    await runHook('cache:clear', this, 'remove', id)
-    return
-  }
+  await clearCache.call(this, id)
+  if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (!noResultSanitizer) result.oldData = await this.sanitizeRecord(result.oldData, options)
@@ -57,7 +55,6 @@ 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, options)
   return dataOnly ? result.oldData : result
 }
 

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execValidation, execModelHook, execDynHook, getSingleRef, handleReq } from './_util.js'
+import { getFilterAndOptions, execHook, execValidation, execModelHook, execDynHook, getSingleRef, handleReq, clearCache } from './_util.js'
 import { onlyTypes } from './create-record.js'
 const action = 'updateRecord'
 
@@ -49,9 +49,9 @@ async function updateRecord (...args) {
   let [id, body = {}, opts = {}] = args
   const { getDefaultValues } = this.app.dobo
   const { isSet } = this.app.lib.aneka
-  const { runHook } = this.app.bajo
   const { cloneDeep, get, omit } = this.app.lib._
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   options.partial = options.partial ?? true
   const { truncateString, noResult, noBodySanitizer, noResultSanitizer, noValidation, partial } = options
@@ -67,10 +67,8 @@ async function updateRecord (...args) {
   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)) ?? {}
-  if (noResult) {
-    await runHook('cache:clear', this, 'update', id, body)
-    return
-  }
+  await clearCache.call(this, id)
+  if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (!noResultSanitizer) {
@@ -82,7 +80,6 @@ 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, options)
   return dataOnly ? result.data : result
 }
 

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

@@ -1,12 +1,12 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook, execValidation, getSingleRef, handleReq } from './_util.js'
+import { getFilterAndOptions, execHook, execModelHook, execDynHook, execValidation, getSingleRef, handleReq, clearCache } from './_util.js'
 const action = 'upsertRecord'
 
 async function native (body = {}, opts = {}) {
   const { isSet } = this.app.lib.aneka
   const { getDefaultValues } = this.app.dobo
-  const { runHook } = this.app.bajo
   const { cloneDeep, get } = this.app.lib._
-  const { dataOnly = true } = opts
+  opts.dataOnly = opts.dataOnly ?? true
+  const { dataOnly } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   const { truncateString, noResult, noBodySanitizer, noResultSanitizer, noValidation } = options
   const extFields = get(options, 'validation.extFields', [])
@@ -16,10 +16,8 @@ async function native (body = {}, opts = {}) {
   await execModelHook.call(this, 'beforeUpsertRecord', input, options)
   await execDynHook.call(this, 'beforeUpsertRecord', input, options)
   const result = options.record ?? (await this.driver._upsertRecord(this, input, options)) ?? {}
-  if (noResult) {
-    await runHook('cache:clear', this, 'upsert', body)
-    return
-  }
+  await clearCache.call(this, body.id)
+  if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
@@ -28,7 +26,6 @@ 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, options)
   return dataOnly ? result.data : result
 }
 
@@ -43,7 +40,7 @@ async function manual (body = {}, options = {}) {
     } catch (err) {
     }
   }
-  const id = get(old, 'dara.id')
+  const id = get(old, 'data.id')
   if (id) return await this.updateRecord(old.data.id, omit(body, ['id']), options)
   return await this.createRecord(body, options)
 }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 2026-04-21
+
+- [2.19.1] Bug fix in ```collect-models.js```, now values are sanitized with ```parseObject()```
+- [2.19.1] Bug fix in ```options.dataOnly``` on all model methods
+- [2.19.1] Add ```options.noMagic```
+- [2.20.0] Revert back to NOT using hooks for caching
+
 ## 2026-04-19
 
 - [2.19.0] Add ```queryAny()``` for query using model's scanables fields