dobo 2.37.1 → 2.38.0

package/extend/bajoCli/applet/{create-aggregate.js → aggregate.js}

@@ -1,6 +1,6 @@
 import postProcess from './lib/post-process.js'
 
-async function createAggregate (path, ...args) {
+async function aggregate (path, ...args) {
   const { importPkg } = this.app.bajo
   const { isEmpty, map } = this.app.lib._
   const { parseKvString } = this.app.lib.aneka
@@ -26,8 +26,8 @@ async function createAggregate (path, ...args) {
     })
   }
   params = isEmpty(params) ? {} : parseKvString(params)
-  await postProcess.call(this, { noConfirmation: true, handler: 'createAggregate', params: [model, filter, params, options], path, processMsg: 'Create aggregate' })
+  await postProcess.call(this, { noConfirmation: true, handler: 'aggregate', params: [model, filter, params, options], path, processMsg: 'Create aggregate' })
   this.app.exit()
 }
 
-export default createAggregate
+export default aggregate

package/extend/bajoCli/applet/{create-histogram.js → histogram.js}

@@ -1,6 +1,6 @@
 import postProcess from './lib/post-process.js'
 
-async function createHistogram (path, ...args) {
+async function histogram (path, ...args) {
   const { importPkg } = this.app.bajo
   const { isEmpty, map } = this.app.lib._
   const { parseKvString } = this.app.lib.aneka
@@ -26,8 +26,8 @@ async function createHistogram (path, ...args) {
     })
   }
   params = isEmpty(params) ? {} : parseKvString(params)
-  await postProcess.call(this, { noConfirmation: true, handler: 'createHistogram', params: [model, filter, params, options], path, processMsg: 'Create histogram' })
+  await postProcess.call(this, { noConfirmation: true, handler: 'histogram', params: [model, filter, params, options], path, processMsg: 'Create histogram' })
   this.app.exit()
 }
 
-export default createHistogram
+export default histogram

package/extend/dobo/adapter/memory.js

@@ -149,13 +149,13 @@ async function memoryAdapterFactory () {
       return { data }
     }
 
-    async createAggregate (model, filter = {}, params = {}, options = {}) {
+    async aggregate (model, filter = {}, params = {}, options = {}) {
       const item = await this.findAllRecord(model, filter, options)
       const result = this.app.dobo.calcAggregate({ data: item.data, ...params })
       return { data: result }
     }
 
-    async createHistogram (model, filter = {}, params = {}, options = {}) {
+    async histogram (model, filter = {}, params = {}, options = {}) {
       const item = await this.findAllRecord(model, filter, options)
       const result = this.app.dobo.calcHistogram({ data: item.data, ...params })
       return { data: result }

package/index.js

@@ -613,12 +613,33 @@ async function factory (pkgName) {
     }
 
     reviveRegexInJson = (input, returnObject = true) => {
-      const { isPlainObject } = this.app.lib._
+      const { isPlainObject, isArray } = 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 new RegExp(value[1], value[2])
+        if (Array.isArray(value) && value[0] === '__REGEXP__') {
+          return { $regex: new RegExp(value[1], value[2]) }
+        }
         return value
       })
+
+      const cleanRegex = (obj) => {
+        const keys = Object.keys(obj)
+        keys.forEach(k => {
+          const v = obj[k]
+          if (isPlainObject(v)) {
+            if (k === '$regex' && isPlainObject(v) && v.$regex) obj[k] = v.$regex
+            else obj[k] = cleanRegex(v)
+          } else if (isArray(v)) {
+            v.forEach((i, idx) => {
+              if (isPlainObject(i) && i.$regex && i.$regex.$regex) obj[k][idx] = i.$regex.$regex
+              else obj[k][idx] = cleanRegex(i)
+            })
+          }
+        })
+        return obj
+      }
+      cleanRegex(result)
+
       return returnObject ? result : JSON.stringify(result)
     }
   }

package/lib/factory/action.js

@@ -14,8 +14,8 @@
  * @property {string[]} [findAllRecord=['filter']]
  * @property {string[]} [findAllRecords=['filter']] - Alias of `findAllRecord`
  * @property {string[]} [countRecord=['params']]
- * @property {string[]} [createAggregate=['params']]
- * @property {string[]} [createHistogram=['params']]
+ * @property {string[]} [aggregate=['params']]
+ * @property {string[]} [histogram=['params']]
  * @property {string[]} [createAttachment=['id']]
  * @property {string[]} [findAttachment=['id']]
  * @property {string[]} [getAttachment=['id', 'field', 'file']]
@@ -34,8 +34,8 @@ const methods = {
   findAllRecord: ['filter'],
   findAllRecords: ['filter'],
   countRecord: ['params'],
-  createAggregate: ['params'],
-  createHistogram: ['params'],
+  aggregate: ['params'],
+  histogram: ['params'],
   createAttachment: ['id'],
   findAttachment: ['id'],
   getAttachment: ['id', 'field', 'file'],

package/lib/factory/adapter.js

@@ -452,7 +452,7 @@ async function adapterFactory () {
         if (!this.support.uniqueIndex) await this._checkUnique(model, body, options)
       }
       if (!options.noIdCheck && isSet(body.id)) {
-        const resp = await this.getRecord(model, body.id, { ...options, noMagic: true })
+        const resp = await this.getRecord(model, body.id, { noMagic: true })
         if (!isEmpty(resp.data)) throw this.plugin.error('recordExists%s%s', body.id, model.name)
       }
       body = this.sanitizeBody(model, body)
@@ -536,7 +536,7 @@ async function adapterFactory () {
         if (!this.support.uniqueIndex) await this._checkUnique(model, body, options)
       }
       if (!options._data) {
-        const resp = await this.getRecord(model, id, { ...options, noMagic: true })
+        const resp = await this.getRecord(model, id, { noMagic: true })
         if (!resp.data) throw this.plugin.error('recordNotFound%s%s', id, model.name)
         options._data = resp.data
       }
@@ -573,7 +573,7 @@ async function adapterFactory () {
       }
       if (isSet(body.id)) {
         if (!options._data) {
-          const resp = await this.getRecord(model, body.id, { ...options, noMagic: true })
+          const resp = await this.getRecord(model, body.id, { noMagic: true })
           if (!resp.data) throw this.plugin.error('recordNotFound%s%s', body.id, model.name)
           options._data = resp.data
         }
@@ -604,7 +604,7 @@ async function adapterFactory () {
      */
     async _removeRecord (model, id, options = {}) {
       if (!options._data) {
-        const resp = await this.getRecord(model, id, { ...options, noMagic: true })
+        const resp = await this.getRecord(model, id, { noMagic: true })
         if (!resp.data) throw this.plugin.error('recordNotFound%s%s', id, model.name)
         options._data = resp.data
       }
@@ -731,7 +731,7 @@ async function adapterFactory () {
     }
 
     /**
-     * Wrapper for the {@link DoboAdapter#createAggregate} method, called internally by `model` to make sure
+     * Wrapper for the {@link DoboAdapter#aggregate} method, called internally by `model` to make sure
      * all adapter hooks are executed accordingly, and all inputs and outputs are sanitized.
      * @internal
      * @async
@@ -742,7 +742,7 @@ async function adapterFactory () {
      * @param {object} options
      * @returns {Promise<object>}
      */
-    async _createAggregate (model, filter = {}, params = {}, options = {}) {
+    async _aggregate (model, filter = {}, params = {}, options = {}) {
       const fieldPropTypes = ['integer', 'smallint', 'float', 'double']
       const groupPropTypes = ['string', ...fieldPropTypes]
       this.app.dobo.checkAggregateParams(params)
@@ -758,9 +758,9 @@ async function adapterFactory () {
 
       let result
       try {
-        await this._attachHook('beforeCreateAggregate', model, filter, params, options)
-        result = await this.createAggregate(model, filter, params, options)
-        await this._attachHook('afterCreateAggregate', model, filter, params, result, options)
+        await this._attachHook('beforeAggregate', model, filter, params, options)
+        result = await this.aggregate(model, filter, params, options)
+        await this._attachHook('afterAggregate', model, filter, params, result, options)
       } catch (err) {
         if (err.message !== '_emptyColumnQuery') throw err
         result = { data: [] }
@@ -774,7 +774,7 @@ async function adapterFactory () {
     }
 
     /**
-     * Wrapper for the {@link DoboAdapter#createHistogram} method, called internally by `model` to make sure
+     * Wrapper for the {@link DoboAdapter#histogram} method, called internally by `model` to make sure
      * all adapter hooks are executed accordingly, and all inputs and outputs are sanitized.
      * @internal
      * @async
@@ -785,7 +785,7 @@ async function adapterFactory () {
      * @param {object} options
      * @returns {Promise<object>}
      */
-    async _createHistogram (model, filter = {}, params, options = {}) {
+    async _histogram (model, filter = {}, params, options = {}) {
       // const fieldPropTypes = ['integer', 'smallint', 'float', 'double']
       const groupPropTypes = ['datetime', 'date']
       this.app.dobo.checkHistogramParams(params)
@@ -800,9 +800,9 @@ async function adapterFactory () {
 
       let result
       try {
-        await this._attachHook('beforeCreateHistogram', model, filter, params, options)
-        result = await this.createHistogram(model, filter, params, options)
-        await this._attachHook('afterCreateHistogram', model, filter, params, result, options)
+        await this._attachHook('beforeHistogram', model, filter, params, options)
+        result = await this.histogram(model, filter, params, options)
+        await this._attachHook('afterHistogram', model, filter, params, result, options)
       } catch (err) {
         if (err.message !== '_emptyColumnQuery') throw err
         result = { data: [] }
@@ -997,8 +997,8 @@ async function adapterFactory () {
      * @param {object} options - Additional options that may affect aggregate creation
      * @returns {Promise<object>} - The result of the aggregate creation
      */
-    async createAggregate (model, filter = {}, params = {}, options = {}) {
-      throw this.plugin.error('notSupportedAdapter%s%s%s', this.app.t('method'), 'createAggregate', this.name)
+    async aggregate (model, filter = {}, params = {}, options = {}) {
+      throw this.plugin.error('notSupportedAdapter%s%s%s', this.app.t('method'), 'aggregate', this.name)
     }
 
     /**
@@ -1013,8 +1013,8 @@ async function adapterFactory () {
      * @param {object} options - Additional options that may affect histogram creation
      * @returns {Promise<object>} - The result of the histogram creation
      */
-    async createHistogram (model, filter = {}, params = {}, options = {}) {
-      throw this.plugin.error('notSupportedAdapter%s%s%s', this.app.t('method'), 'createHistogram', this.name)
+    async histogram (model, filter = {}, params = {}, options = {}) {
+      throw this.plugin.error('notSupportedAdapter%s%s%s', this.app.t('method'), 'histogram', this.name)
     }
 
     /**

package/lib/factory/model/aggregate.js

@@ -0,0 +1,23 @@
+import { getFilterAndOptions, execHook, execModelHook, execDynHook } from './helper.js'
+const action = 'aggregate'
+
+async function aggregate (...args) {
+  if (args.length === 0) return this.action(action, ...args)
+  const [_filter = {}, params = {}, opts = {}] = args
+  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, 'beforeAggregate', filter, params, options)
+  await execModelHook.call(this, 'beforeAggregate', filter, params, options)
+  await execDynHook.call(this, 'beforeAggregate', filter, params, options)
+  const result = (await this.adapter._aggregate(this, filter, params, options)) ?? {}
+  const { warnings } = getDefaultValues(options)
+  if (!warnings) delete result.warnings
+  await execDynHook.call(this, 'afterAggregate', filter, params, result, options)
+  await execModelHook.call(this, 'afterAggregate', filter, params, result, options)
+  await execHook.call(this, 'afterAggregate', filter, params, result, options)
+  return dataOnly ? result.data : result
+}
+
+export default aggregate

package/lib/factory/model/histogram.js

@@ -0,0 +1,23 @@
+import { getFilterAndOptions, execHook, execModelHook, execDynHook } from './helper.js'
+const action = 'histogram'
+
+async function histogram (...args) {
+  if (args.length === 0) return this.action(action, ...args)
+  const [_filter = {}, params = {}, opts = {}] = args
+  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, 'beforeHistogram', filter, params, options)
+  await execModelHook.call(this, 'beforeHistogram', filter, params, options)
+  await execDynHook.call(this, 'beforeHistogram', filter, params, options)
+  const result = (await this.adapter._histogram(this, filter, params, options)) ?? {}
+  const { warnings } = getDefaultValues(options)
+  if (!warnings) delete result.warnings
+  await execDynHook.call(this, 'afterHistogram', filter, params, result, options)
+  await execModelHook.call(this, 'afterHistogram', filter, params, result, options)
+  await execHook.call(this, 'afterHistogram', filter, params, result, options)
+  return dataOnly ? result.data : result
+}
+
+export default histogram

package/lib/factory/model.js

@@ -7,8 +7,8 @@ import findAllRecord from './model/find-all-record.js'
 import findOneRecord from './model/find-one-record.js'
 import findRecord from './model/find-record.js'
 import getRecord from './model/get-record.js'
-import createHistogram from './model/create-histogram.js'
-import createAggregate from './model/create-aggregate.js'
+import histogram from './model/histogram.js'
+import aggregate from './model/aggregate.js'
 import exists from './model/exists.js'
 import build from './model/build.js'
 import loadFixtures from './model/load-fixtures.js'
@@ -271,8 +271,8 @@ async function modelFactory () {
         transaction,
         bulkCreateRecord,
 
-        createAggregate,
-        createHistogram,
+        aggregate,
+        histogram,
         countRecord,
 
         createAttachment,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "2.37.1",
+  "version": "2.38.0",
   "description": "DBMS for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/ardhi/dobo#readme",
   "dependencies": {
-    "@tryghost/nql": "^0.12.7",
+    "@tryghost/nql": "^0.13.2",
     "joi": "^18.0.2",
     "mingo": "^6.5.1",
     "ulid": "^3.0.2",

package/wiki/CHANGES.md

@@ -1,10 +1,16 @@
 # Changes
 
+## 2026-08-18
+
+- [2.38.0] Change `createAggregate()` to `aggregate()`
+- [2.38.0] Change `createHistogram()` to `histogram()`
+
 ## 2026-08-13
 
 - [2.37.1] Bug fix in `adapter.js` to pass options when calling `getRecord()`
 - [2.37.1] Bug fix in `model._simpleLookup()` to return `null` if query string is not right
 - [2.37.1] Bug fix in `model.sanitizeFixture()` to not sanitize value that is `null` or `undefined`
+- [2.37.2] Bug fix in `reviveRegexInJson()` when handling with regex
 
 ## 2026-08-06
 

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

@@ -1,23 +0,0 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook } from './helper.js'
-const action = 'createAggregate'
-
-async function createAggregate (...args) {
-  if (args.length === 0) return this.action(action, ...args)
-  const [_filter = {}, params = {}, opts = {}] = args
-  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)
-  await execModelHook.call(this, 'beforeCreateAggregate', filter, params, options)
-  await execDynHook.call(this, 'beforeCreateAggregate', filter, params, options)
-  const result = (await this.adapter._createAggregate(this, filter, params, options)) ?? {}
-  const { warnings } = getDefaultValues(options)
-  if (!warnings) delete result.warnings
-  await execDynHook.call(this, 'afterCreateAggregate', filter, params, result, options)
-  await execModelHook.call(this, 'afterCreateAggregate', filter, params, result, options)
-  await execHook.call(this, 'afterCreateAggregate', filter, params, result, options)
-  return dataOnly ? result.data : result
-}
-
-export default createAggregate

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

@@ -1,23 +0,0 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook } from './helper.js'
-const action = 'createHistogram'
-
-async function createHistogram (...args) {
-  if (args.length === 0) return this.action(action, ...args)
-  const [_filter = {}, params = {}, opts = {}] = args
-  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)
-  await execModelHook.call(this, 'beforeCreateHistogram', filter, params, options)
-  await execDynHook.call(this, 'beforeCreateHistogram', filter, params, options)
-  const result = (await this.adapter._createHistogram(this, filter, params, options)) ?? {}
-  const { warnings } = getDefaultValues(options)
-  if (!warnings) delete result.warnings
-  await execDynHook.call(this, 'afterCreateHistogram', filter, params, result, options)
-  await execModelHook.call(this, 'afterCreateHistogram', filter, params, result, options)
-  await execHook.call(this, 'afterCreateHistogram', filter, params, result, options)
-  return dataOnly ? result.data : result
-}
-
-export default createHistogram