dobo 2.18.2 → 2.19.1

package/index.js

@@ -539,23 +539,47 @@ async function factory (pkgName) {
       return nql(sanitized).parse()
     }
 
-    parseQuery = (query, silent = true) => {
-      const { isPlainObject, trim } = this.app.lib._
+    parseAny = (query, model) => {
+      const { isEmpty } = this.app.lib._
+      let q = {}
+      if (!model) throw this.error('invalidQuery')
+      let scanables = [...model.scanables]
+      if (scanables.length === 0) scanables = [...model.sortables]
+      const fields = scanables.filter(f => {
+        const field = find(model.properties, { name: f, type: 'string' })
+        return !!field
+      })
+      const parts = fields.map(f => {
+        if (query[0] === '*') return `${f}:~$'${query.replaceAll('*', '')}'`
+        if (query[query.length - 1] === '*') return `${f}:~^'${query.replaceAll('*', '')}'`
+        return `${f}:~'${query.replaceAll('*', '')}'`
+      })
+      if (parts.length === 1) q = this.parseNql(parts[0])
+      else if (parts.length > 1) q = this.parseNql(parts.join(','))
+      if (isEmpty(q)) throw this.error('invalidQuery')
+      return q
+    }
+
+    parseQuery = (query, model, silent = true) => {
+      const { isEmpty, isPlainObject, trim } = this.app.lib._
       let result = {}
       if (isPlainObject(query)) result = query
       else {
         query = trim(query)
+        if (isEmpty(query)) return result
         try {
           if (query.startsWith('{')) result = JSON.parse(query)
-          else result = this.parseNql(query)
+          else if (query.includes(':')) result = this.parseNql(query)
+          else result = this.parseAny(query, model)
         } catch (err) {
           if (silent) return {}
           throw err
         }
       }
+      let strQ = this.replaceRegexInJson(result)
+      if (model && model.driver.idField.name !== 'id') strQ = strQ.replaceAll('"id"', `"${model.driver.idField.name}"`)
       try {
-        const text = JSON.stringify(result)
-        if (text.includes('["__REGEXP__",')) result = this.reviveRegexInJson(text)
+        result = this.reviveRegexInJson(strQ)
       } catch (err) {}
       return result
     }
@@ -575,7 +599,7 @@ async function factory (pkgName) {
       const { isPlainObject } = this.app.lib._
       if (isPlainObject(input)) input = JSON.stringify(input)
       const result = JSON.parse(input, (key, value) => {
-        if (Array.isArray(value) && value[0] === '__REGEXP__') return { $regex: new RegExp(value[1], value[2]) }
+        if (Array.isArray(value) && value[0] === '__REGEXP__') return new RegExp(value[1], value[2])
         return value
       })
       return returnObject ? result : JSON.stringify(result)

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
@@ -77,7 +87,6 @@ export async function getFilterAndOptions (filter = {}, options = {}, action) {
   if (!nOptions.noModelHook) await runModelHook(this, 'beforeBuilSearch', nFilter.search, nOptions)
   nFilter.search = buildFilterSearch.call(this, nFilter) ?? {}
   if (!nOptions.noModelHook) await runModelHook(this, 'afterBuildSearch', nFilter.search, nOptions)
-  if (this.driver.idField.name !== 'id') replaceIdInQuerySearch.call(this, nFilter)
   const { limit, page, skip, sort } = preparePagination.call(this, nFilter, nOptions)
   nFilter.limit = limit
   nFilter.page = page
@@ -190,7 +199,7 @@ export async function getSingleRef (record = {}, options = {}) {
           let query = {}
           query[ref.field] = record[prop.name]
           if (ref.field === 'id') query[ref.field] = this.sanitizeId(query[ref.field])
-          if (ref.query) query = { $and: [query, parseQuery(ref.query)] }
+          if (ref.query) query = { $and: [query, parseQuery(ref.query, rModel)] }
           const filter = { query }
           const resp = await _getRef.call(this, { ref, rModel, prop, key, options, filter })
           if (!resp) continue
@@ -228,7 +237,7 @@ export async function getMultiRefs (records = [], options = {}) {
           matches = uniq(without(matches, undefined, null, NaN))
           let query = {}
           query[ref.field] = { $in: matches }
-          if (ref.query) query = { $and: [query, parseQuery(ref.query)] }
+          if (ref.query) query = { $and: [query, parseQuery(ref.query, rModel)] }
           const filter = { query, limit: matches.length }
           const resp = await _getRef.call(this, { ref, rModel, prop, key, options, filter })
           if (!resp) continue
@@ -247,35 +256,9 @@ export async function getMultiRefs (records = [], options = {}) {
 }
 
 export function buildFilterQuery (filter = {}) {
-  const { trim, find, isString, isPlainObject } = this.app.lib._
-  const { parseNql } = this.app.dobo
-  let query = filter.query ?? {}
-  let q = {}
-  if (isString(query)) {
-    try {
-      query = trim(query)
-      if (query.startsWith('{')) q = JSON.parse(query) // JSON formatted query
-      else if (query.includes(':')) q = parseNql(query) // NQL
-      else {
-        let scanables = [...this.scanables]
-        if (scanables.length === 0) scanables = [...this.sortables]
-        const fields = scanables.filter(f => {
-          const field = find(this.properties, { name: f, type: 'string' })
-          return !!field
-        })
-        const parts = fields.map(f => {
-          if (query[0] === '*') return `${f}:~$'${query.replaceAll('*', '')}'`
-          if (query[query.length - 1] === '*') return `${f}:~^'${query.replaceAll('*', '')}'`
-          return `${f}:~'${query.replaceAll('*', '')}'`
-        })
-        if (parts.length === 1) q = parseNql(parts[0])
-        else if (parts.length > 1) q = parseNql(parts.join(','))
-      }
-    } catch (err) {
-      this.plugin.error('invalidQuery', { orgMessage: err.message })
-    }
-  } else if (isPlainObject(query)) q = query
-  return sanitizeQuery.call(this, q)
+  const { parseQuery } = this.app.dobo
+  const query = parseQuery(filter.query ?? {}, this, false)
+  return sanitizeQuery.call(this, query)
 }
 
 function sanitizeQuery (query = {}, parent) {
@@ -346,7 +329,7 @@ export function buildFilterSearch (filter = {}) {
       items[part.field].push(...part.value.split(' ').filter(v => ![''].includes(v)))
     }
   }
-  const s = {}
+  let s = {}
   for (const index of this.indexes.filter(i => i.type === 'fulltext')) {
     for (const f of index.fields) {
       const value = []
@@ -357,22 +340,15 @@ export function buildFilterSearch (filter = {}) {
     }
   }
   if (has(items, '*')) s['*'] = items['*']
+  if (this.driver.idField.name !== 'id') {
+    const search = JSON.stringify(s).replaceAll('"id"', `"${this.driver.idField.name}"`)
+    try {
+      s = JSON.parse(search)
+    } catch (err) {}
+  }
   return s
 }
 
-export function replaceIdInQuerySearch (filter) {
-  const { replaceRegexInJson, reviveRegexInJson } = this.app.dobo
-  const query = replaceRegexInJson(filter.query).replaceAll('"id"', `"${this.driver.idField.name}"`)
-  try {
-    filter.query = reviveRegexInJson(query)
-  } catch (err) {}
-  // search
-  const search = JSON.stringify(filter.search ?? {}).replaceAll('"id"', `"${this.driver.idField.name}"`)
-  try {
-    filter.search = JSON.parse(search)
-  } catch (err) {}
-}
-
 /**
  * Prepare records pagination:
  * - making sure records limit is obeyed

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,63 +4,53 @@ 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 } = this.app.lib._
   const [params = {}, opts = {}] = args
-  const { dataOnly = true } = opts
-  const { get: getCache, set: setCache } = 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
-  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) {
+  const { noResultSanitizer } = options
+  try {
+    await execHook.call(this, 'beforeFindRecord', filter, options)
+    await execModelHook.call(this, 'beforeFindRecord', filter, options)
+    await execDynHook.call(this, 'beforeFindRecord', filter, options)
+    let result = options.record ?? (await this.driver._findAllRecord(this, filter, options)) ?? {}
+    result.limit = filter.limit
+    result.filter = pick(filter, ['query', 'match', 'sort'])
+    result.warnings = result.warnings ?? []
+    if (!options.count) result = omit(result, ['count', 'pages'])
+    else if (options.count && result.count > hardCap) {
+      result.warnings.push(t('hardCapWarning%s%s', result.count, hardCap))
+      result.count = hardCap
+      result.hardCapped = true
+    }
+    result.pages = options.count ? Math.ceil(result.count / filter.limit) : undefined
+    if (!warnings) delete result.warnings
+
+    if (!noResultSanitizer) {
       for (const idx in result.data) {
         result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
       }
-      result.cached = true
-      return dataOnly ? result.data : result
     }
+    if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
+    await execDynHook.call(this, 'afterFindRecord', filter, result, options)
+    await execModelHook.call(this, 'afterFindRecord', filter, result, options)
+    await execHook.call(this, 'afterFindRecord', filter, result, options)
+    return dataOnly ? result.data : result
+  } catch (err) {
+    if (err.code === 'cachedResult') return err.data
+    throw err
   }
-  let result = options.record ?? (await this.driver._findAllRecord(this, filter, options)) ?? {}
-  result.limit = filter.limit
-  result.filter = pick(filter, ['query', 'match', 'sort'])
-  result.warnings = result.warnings ?? []
-  if (!options.count) result = omit(result, ['count', 'pages'])
-  else if (options.count && result.count > hardCap) {
-    result.warnings.push(t('hardCapWarning%s%s', result.count, hardCap))
-    result.count = hardCap
-    result.hardCapped = true
-  }
-  result.pages = options.count ? Math.ceil(result.count / filter.limit) : undefined
-  if (!warnings) delete result.warnings
-
-  if (!noResultSanitizer) {
-    for (const idx in result.data) {
-      result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
-    }
-  }
-  if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
-  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
-  }
-  return dataOnly ? result.data : result
 }
 
 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,56 +69,45 @@ 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 } = this.app.lib._
+  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
-  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) {
+  const { noResultSanitizer } = options
+  try {
+    await execHook.call(this, 'beforeFindRecord', filter, options)
+    await execModelHook.call(this, 'beforeFindRecord', filter, options)
+    await execDynHook.call(this, 'beforeFindRecord', filter, options)
+    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.warnings = result.warnings ?? []
+    if (!options.count) result = omit(result, ['count', 'pages'])
+    else if (options.count && result.count > hardCap) {
+      result.warnings.push(t('hardCapWarning%s%s', result.count, hardCap))
+      result.count = hardCap
+      result.hardCapped = true
+    }
+    result.pages = options.count ? Math.ceil(result.count / filter.limit) : undefined
+    if (!warnings) delete result.warnings
+
+    if (!noResultSanitizer) {
       for (const idx in result.data) {
         result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
       }
-      result.cached = true
-      return dataOnly ? result.data : result
     }
+    if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
+    await execDynHook.call(this, 'afterFindRecord', filter, result, options)
+    await execModelHook.call(this, 'afterFindRecord', filter, result, options)
+    await execHook.call(this, 'afterFindRecord', filter, result, options)
+    return dataOnly ? result.data : result
+  } catch (err) {
+    if (err.code === 'cachedResult') return err.data
+    throw err
   }
-  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.warnings = result.warnings ?? []
-  if (!options.count) result = omit(result, ['count', 'pages'])
-  else if (options.count && result.count > hardCap) {
-    result.warnings.push(t('hardCapWarning%s%s', result.count, hardCap))
-    result.count = hardCap
-    result.hardCapped = true
-  }
-  result.pages = options.count ? Math.ceil(result.count / filter.limit) : undefined
-  if (!warnings) delete result.warnings
-
-  if (!noResultSanitizer) {
-    for (const idx in result.data) {
-      result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
-    }
-  }
-  if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
-  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
-  }
-  return dataOnly ? result.data : result
 }
 
 export default findRecord

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

@@ -48,38 +48,29 @@ 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
+  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
-    }
+  try {
+    await execHook.call(this, 'beforeGetRecord', id, options)
+    await execModelHook.call(this, 'beforeGetRecord', id, options)
+    await execDynHook.call(this, 'beforeGetRecord', id, options)
+    const result = options.record ?? (await this.driver._getRecord(this, id, options)) ?? {}
+    const { warnings } = getDefaultValues(options)
+    if (!warnings) delete result.warnings
+    if (isEmpty(result.data) && !options.throwNotFound) return dataOnly ? undefined : { data: undefined }
+    if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
+    if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
+    await execDynHook.call(this, 'afterGetRecord', id, result, options)
+    await execModelHook.call(this, 'afterGetRecord', id, result, options)
+    await execHook.call(this, 'afterGetRecord', id, result, options)
+    return dataOnly ? result.data : result
+  } catch (err) {
+    if (err.code === 'cachedResult') return err.data
+    throw err
   }
-  const result = options.record ?? (await this.driver._getRecord(this, id, options)) ?? {}
-  const { warnings } = getDefaultValues(options)
-  if (!warnings) delete result.warnings
-  if (isEmpty(result.data) && !options.throwNotFound) return dataOnly ? undefined : { data: undefined }
-  if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
-  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
-  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
-  }
-  return dataOnly ? result.data : result
 }
 
 export default getRecord

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

@@ -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,7 @@ 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
-  }
+  if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (!noResultSanitizer) result.oldData = await this.sanitizeRecord(result.oldData, options)
@@ -57,7 +54,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

@@ -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,7 @@ 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
-  }
+  if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (!noResultSanitizer) {
@@ -82,7 +79,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

@@ -4,9 +4,9 @@ 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,7 @@ 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
-  }
+  if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
@@ -28,7 +25,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
 }
 

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,18 @@
 # Changes
 
+## 2026-04-21
+
+- [2.5.1] Bug fix in ```collect-models.js```, now values are sanitized with ```parseObject()```
+- [2.5.1] Bug fix in ```options.dataOnly``` on all model methods
+- [2.5.1] Add ```options.noMagic```
+
+## 2026-04-19
+
+- [2.19.0] Add ```queryAny()``` for query using model's scanables fields
+- [2.19.0] Bug fix in ```reviveRegexInJson()```
+- [2.19.0] Bug fix in query sanitizing especially for regex existance
+- [2.19.0] Remove ```replaceIdInQuerySearch()``` in ```_util.js``` as it isn't needed anymore
+
 ## 2026-04-18
 
 - [2.18.2] Bug fix in ```config``` object