dobo 2.37.0 → 2.37.2

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/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, { noMagic: true })
+        const resp = await this.getRecord(model, body.id, { ...options, 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, { noMagic: true })
+        const resp = await this.getRecord(model, id, { ...options, 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, { noMagic: true })
+          const resp = await this.getRecord(model, body.id, { ...options, 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, { noMagic: true })
+        const resp = await this.getRecord(model, id, { ...options, noMagic: true })
         if (!resp.data) throw this.plugin.error('recordNotFound%s%s', id, model.name)
         options._data = resp.data
       }

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

@@ -47,7 +47,7 @@ async function sanitizeFixture (params = {}, opts = {}) {
     if (val === null) body[key] = undefined
     else {
       const prop = this.properties.find(item => item.name === key)
-      if (prop && ['string', 'text'].includes(prop.type)) body[key] += ''
+      if (prop && ['string', 'text'].includes(prop.type) && isSet(body[key])) body[key] += ''
     }
   }
   return body

package/lib/factory/model.js

@@ -450,6 +450,7 @@ async function modelFactory () {
       for (const key in lookupValue) {
         query = query.replaceAll(`{${key}}`, lookupValue[key])
       }
+      if (query.includes('{') && query.includes('}')) return null
       if (isEmpty(field)) field = 'id'
       const { getModel } = this.app.dobo
       const ref = getModel(model)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "2.37.0",
+  "version": "2.37.2",
   "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,5 +1,12 @@
 # Changes
 
+## 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
 
 - [2.37.0] Update `memory.connect()` to use the new `app.lib.setInterval()`