dobo 2.28.0 → 2.29.1

package/extend/dobo/feature/immutable.js

@@ -3,7 +3,20 @@ async function beforeRemoveRecord (id, opts, options) {
   if (get(options, 'req.user.isXSiteAdmin')) return
   const record = await this.driver.getRecord(this, id)
   const immutable = get(record.data, opts.field)
-  if (immutable) throw this.plugin.error('recordImmutable%s%s', id, this.name, { statusCode: 423 })
+  if (immutable.length === 1 && immutable[0] === '*') throw this.plugin.error('recordImmutable%s%s', id, this.name, { statusCode: 423 })
+}
+
+async function beforeUpdateRecord (id, body, opts, options) {
+  const { get } = this.app.lib._
+  if (get(options, 'req.user.isXSiteAdmin')) return
+  const record = await this.driver.getRecord(this, id)
+  const immutable = get(record.data, opts.field)
+  if (immutable.length === 0) return
+  const fields = []
+  if (immutable.length === 1 && immutable[0] === '*') fields.push(...this.getNonVirtualProperties(true))
+  for (const field of fields) {
+    delete body[field]
+  }
 }
 
 async function immutable (opts = {}) {
@@ -11,12 +24,13 @@ async function immutable (opts = {}) {
   return {
     properties: {
       name: opts.field,
-      type: 'boolean'
+      type: 'array',
+      default: []
     },
     hooks: [{
       name: 'beforeUpdateRecord',
       handler: async function (id, body, options) {
-        await beforeRemoveRecord.call(this, id, opts, options)
+        await beforeUpdateRecord.call(this, id, body, opts, options)
       }
     }, {
       name: 'beforeRemoveRecord',

package/lib/factory/model/_util.js

@@ -72,7 +72,6 @@ export async function getFilterAndOptions (filter = {}, options = {}, action) {
   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

package/lib/factory/model/load-fixtures.js

@@ -1,14 +1,14 @@
 import path from 'path'
 
-async function exec ({ item, spinner, options, result, items } = {}) {
+async function exec ({ body, spinner, options, result, bodies } = {}) {
   const { isArray, isString } = this.app.lib._
   const { getPluginDataDir } = this.app.bajo
   const { fs } = this.app.lib
 
   await this.transaction(async (trx) => {
-    const resp = await this.createRecord(item, { ...options, trx })
-    if (isArray(item._attachments) && item._attachments.length > 0) {
-      for (let att of item._attachments) {
+    const resp = await this.createRecord(body, { ...options, trx })
+    if (isArray(body._attachments) && body._attachments.length > 0) {
+      for (let att of body._attachments) {
         if (isString(att)) att = { field: 'file', file: att }
         const fname = path.basename(att.file)
         if (fs.existsSync(att.file)) {
@@ -21,19 +21,18 @@ async function exec ({ item, spinner, options, result, items } = {}) {
     }
   })
   result.success++
-  if (spinner) spinner.setText('recordsAdded%s%d%d', this.name, result.success, items.length)
+  if (spinner) spinner.setText('recordsAdded%s%d%d', this.name, result.success, bodies.length)
 }
 
 async function loadFixtures ({ spinner, ignoreError = true, collectItems = false, noLookup = false } = {}, options = {}) {
   const { readConfig } = this.app.bajo
-  const { isSet } = this.app.lib.aneka
-  const { isEmpty, isString, isArray, pullAt } = this.app.lib._
+  const { isEmpty } = this.app.lib._
   if (this.connection.proxy) {
     this.log.warn('proxiedConnBound%s', this.name)
     return
   }
   const result = { success: 0, failed: 0 }
-  const items = await readConfig(`${this.plugin.ns}:/extend/dobo/fixture/${this.baseName}.*`, { ns: this.plugin.ns, baseNs: 'dobo', checkOverride: true, defValue: [] })
+  const bodies = await readConfig(`${this.plugin.ns}:/extend/dobo/fixture/${this.baseName}.*`, { ns: this.plugin.ns, baseNs: 'dobo', checkOverride: true, defValue: [] })
   const opts = {
     ...options,
     noModelHook: false,
@@ -42,49 +41,22 @@ async function loadFixtures ({ spinner, ignoreError = true, collectItems = false
     noValidation: false,
     noCache: true
   }
-  for (const item of items) {
-    const lv = {}
-    const deleted = {}
-    for (const key in item) {
-      const val = item[key]
-      deleted[key] = deleted[key] ?? []
-      if (!noLookup) {
-        if (isString(val) && val.slice(0, 2) === '?:') {
-          item[key] = await this._simpleLookup(val.slice(2), lv, opts)
-          lv[key] = item[key]
-        } else if (isArray(val)) {
-          for (const idx in val) {
-            if (isString(val[idx]) && val[idx].slice(0, 2) === '?:') {
-              item[key][idx] = await this._simpleLookup(val[idx].slice(2), lv, opts)
-              if (isSet(item[key][idx])) item[key][idx] += ''
-              else deleted[key].push(idx)
-              lv[`${key}.${idx}`] = item[key][idx]
-            }
-          }
-          if (deleted[key].length > 0) pullAt(item[key], deleted[key])
-        }
-      }
-      delete deleted[key]
-      if (val === null) item[key] = undefined
-      else {
-        const prop = this.properties.find(item => item.name === key)
-        if (prop && ['string', 'text'].includes(prop.type)) item[key] += ''
-      }
-    }
+  for (const body of bodies) {
+    await this.sanitizeFixture({ body, noLookup }, options)
   }
-  if (collectItems) return items
-  if (isEmpty(items)) return result
-  for (const item of items) {
+  if (collectItems) return bodies
+  if (isEmpty(bodies)) return result
+  for (const body of bodies) {
     if (ignoreError) {
       try {
-        await exec.call(this, { item, spinner, options: opts, result, items })
+        await exec.call(this, { body, spinner, options: opts, result, bodies })
       } catch (err) {
         if (this.app.bajo.config.log.applet) console.error(err)
         err.model = this.name
         if (this.app.applet) this.plugin.print.fail(this.app.dobo.validationErrorMessage(err))
         result.failed++
       }
-    } else await exec.call(this, { item, spinner, options: opts, result, items })
+    } else await exec.call(this, { body, spinner, options: opts, result, bodies })
   }
   return result
 }

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

@@ -33,11 +33,11 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
 
   const omitted = []
   const details = []
-  const properties = [...this.properties, ...extFields]
+  const properties = [...this.getNonVirtualProperties(), ...extFields]
   for (const prop of properties) {
     try {
       if (partial && !has(body, prop.name)) {
-        if (prop.type === 'array') result[prop.name] = null
+        // if (prop.type === 'array') result[prop.name] = null
         continue
       }
       result[prop.name] = body[prop.name]

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

@@ -0,0 +1,43 @@
+async function sanitizeFixture ({ body = {}, lookupValue = {}, noLookup } = {}, options = {}) {
+  const { isString, isArray, pullAt, cloneDeep } = this.app.lib._
+  const { isSet } = this.app.lib.aneka
+  const lv = cloneDeep(lookupValue)
+  const deleted = {}
+  const opts = {
+    ...options,
+    noModelHook: false,
+    noHook: true,
+    noDynHook: true,
+    noValidation: false,
+    noCache: true
+  }
+  for (const key in body) {
+    const val = body[key]
+    deleted[key] = deleted[key] ?? []
+    if (!noLookup) {
+      if (isString(val) && val.slice(0, 2) === '?:') {
+        body[key] = await this._simpleLookup(val.slice(2), lv, opts)
+        lv[key] = body[key]
+      } else if (isArray(val)) {
+        for (const idx in val) {
+          if (isString(val[idx]) && val[idx].slice(0, 2) === '?:') {
+            body[key][idx] = await this._simpleLookup(val[idx].slice(2), lv, opts)
+            if (isSet(body[key][idx])) body[key][idx] += ''
+            else deleted[key].push(idx)
+            lv[`${key}.${idx}`] = body[key][idx]
+          }
+        }
+        if (deleted[key].length > 0) pullAt(body[key], deleted[key])
+      }
+    }
+    delete deleted[key]
+    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] += ''
+    }
+  }
+  return body
+}
+
+export default sanitizeFixture

package/lib/factory/model/validate.js

@@ -86,7 +86,8 @@ const validator = {
     'sign', 'unsafe'],
   boolean: ['falsy', 'sensitive', 'truthy'],
   date: ['greater', 'iso', 'less', 'max', 'min'],
-  timestamp: ['timestamp']
+  timestamp: ['timestamp'],
+  array: ['length', 'max', 'min']
 }
 
 async function buildFromDbModel (opts = {}) {

package/lib/factory/model.js

@@ -22,6 +22,7 @@ import findAttachment from './model/find-attachment.js'
 import sanitizeBody from './model/sanitize-body.js'
 import sanitizeRecord from './model/sanitize-record.js'
 import sanitizeId from './model/sanitize-id.js'
+import sanitizeFixture from './model/sanitize-fixture.js'
 import upsertRecord from './model/upsert-record.js'
 import bulkCreateRecord from './model/bulk-create-record.js'
 import listAttachment from './model/list-attachment.js'
@@ -193,6 +194,7 @@ async function modelFactory () {
     sanitizeRecord = sanitizeRecord
     sanitizeBody = sanitizeBody
     sanitizeId = sanitizeId
+    sanitizeFixture = sanitizeFixture
     validate = validate
 
     // aliases

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 2026-06-11
+
+- [2.29.1] Bug fix in ```model.sanitizeBody()```
+
+## 2026-06-10
+
+- [2.29.0] Feature ```dobo:immutable``` now using array instead of boolean
+- [2.29.0] Add ```model.sanitizeFixture()```
+- [2.29.0] Options ```noMagic``` no without touching ```noModelHook```
+- [2.29.0] Add ```array``` validator type
+
 ## 2026-06-03
 
 - [2.28.0] Property ```values``` can now accept a function that will be called dynamically upon used