dobo 2.24.0 → 2.25.0

package/extend/bajo/intl/en-US.json

@@ -225,6 +225,9 @@
       "required": "Required",
       "only": "Must match with %(ref)s"
     },
+    "array": {
+      "base": "Required"
+    },
     "string": {
       "alphanum": "Must only contain alpha-numeric characters",
       "base": "Must be a string",

package/extend/bajo/intl/id.json

@@ -224,6 +224,9 @@
       "required": "Harus diisi/dipilih",
       "only": "Harus sesuai dengan %(ref)s"
     },
+    "array": {
+      "base": "Required"
+    },
     "string": {
       "alphanum": "Harus berupa alfa numerik karakter saja",
       "base": "Harus berupa string",

package/extend/dobo/feature/immutable.js

@@ -1,6 +1,6 @@
 async function beforeRemoveRecord (id, opts, options) {
   const { get } = this.app.lib._
-  if (get(options, 'req.user.interSiteAdmin')) return
+  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 })

package/index.js

@@ -73,11 +73,11 @@ const propertyType = {
     rules: []
   },
   object: {
-    validator: null,
+    validator: 'object',
     rules: []
   },
   array: {
-    validator: null,
+    validator: 'array',
     rules: []
   }
 }

package/lib/factory/model/_util.js

@@ -188,7 +188,7 @@ export async function getRefs (records = [], options = {}) {
           if (!rModel) return
           let matches = []
           for (const rec of records) {
-            const items = isValues ? [...rec[prop.name]] : [rec[prop.name]]
+            const items = isValues ? [...(rec[prop.name] ?? [])] : (rec[prop.name] ? [rec[prop.name]] : [])
             matches.push(...items.map(item => prop.name === 'id' ? rModel.sanitizeId(item) : item))
           }
           matches = uniq(without(matches, undefined, null, NaN)).map(i => i + '')
@@ -211,7 +211,7 @@ export async function getRefs (records = [], options = {}) {
           for (const i in records) {
             records[i]._ref = records[i]._ref ?? {}
             const rec = records[i]
-            let items = isValues ? [...rec[prop.name]] : [rec[prop.name]]
+            let items = isValues ? [...(rec[prop.name] ?? [])] : (rec[prop.name] ? [rec[prop.name]] : [])
             items = items.map(item => item + '')
             const res = results.filter(r => items.includes(r[ref.field] + ''))
             if (res.length === 0) records[i]._ref[key] = isValues ? [] : {}

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

@@ -27,7 +27,7 @@ async function exec ({ item, spinner, options, result, items } = {}) {
 async function loadFixtures ({ spinner, ignoreError = true, collectItems = false, noLookup = false } = {}, options = {}) {
   const { readConfig } = this.app.bajo
   const { resolvePath, isSet } = this.app.lib.aneka
-  const { isEmpty, isString, isArray } = this.app.lib._
+  const { isEmpty, isString, isArray, pullAt } = this.app.lib._
   if (this.connection.proxy) {
     this.log.warn('proxiedConnBound%s', this.name)
     return
@@ -39,8 +39,10 @@ async function loadFixtures ({ spinner, ignoreError = true, collectItems = false
   const opts = { ...options, noMagic: 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)
@@ -50,11 +52,14 @@ async function loadFixtures ({ spinner, ignoreError = true, collectItems = false
             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)

package/lib/factory/model/validate.js

@@ -1,6 +1,6 @@
 import joi from 'joi'
 
-const excludedTypes = ['object', 'array']
+const excludedTypes = ['object']
 const excludedNames = []
 
 /**
@@ -142,7 +142,9 @@ async function buildFromDbModel (opts = {}) {
         const resp = await callHandler(prop.values)
         items = resp.map(item => item.value)
       }
-      obj = obj.valid(...items)
+      if (prop.type === 'array') {
+        obj = obj.items(joi.string().valid(...items))
+      } else obj = obj.valid(...items)
     }
     if (prop.rulesMsg) {
       const msgs = {}
@@ -185,6 +187,9 @@ async function buildFromDbModel (opts = {}) {
       case 'boolean':
         item = await applyFieldRules(p, joi.boolean())
         break
+      case 'array':
+        item = await applyFieldRules(p, joi.array())
+        break
     }
     if (item) {
       if (item.$_root && !p.required) obj[p.name] = item.allow(null, '')

package/lib/factory/model.js

@@ -96,11 +96,16 @@ async function modelFactory () {
       return namesOnly ? items.map(item => item.name) : items
     }
 
-    getVirtualProperties = ({ namesOnly }) => {
+    getVirtualProperties = (namesOnly) => {
       const items = this.properties.filter(prop => prop.virtual)
       return namesOnly ? items.map(item => item.name) : items
     }
 
+    getNonVirtualProperties = (namesOnly) => {
+      const items = this.properties.filter(prop => !prop.virtual)
+      return namesOnly ? items.map(item => item.name) : items
+    }
+
     getIndexes = () => {
       return this.indexes
     }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-05-22
+
+- [2.25.0] Add ```array``` & ```object``` validator handling
+- [2.25.0] Change ```interSite``` definition to ```xSite```
+- [2.25.0] Add ```model.getNonVirtualProperties()```
+- [2.25.0] Bug fix in ```model.loadFixtures()```
+- [2.25.0] Handle ```array``` validation schema
+
 ## 2026-05-16
 
 - [2.24.0] Change ```dobo:immutable``` feature, field no longer hidden