dobo 2.9.3 → 2.10.0

package/extend/bajoCli/applet/rebuild-model.js

@@ -57,7 +57,7 @@ async function modelRebuild (path, ...args) {
       }
     }
     try {
-      await model.build({ spinner: spin })
+      await model.build()
       spin.succeed('modelCreated%s', model.name)
       result.succed++
     } catch (err) {

package/index.js

@@ -81,7 +81,7 @@ const propertyType = {
   }
 }
 
-const commonPropertyTypes = ['name', 'type', 'required', 'rules', 'validator', 'ref', 'default', 'values', 'rulesMsg']
+const commonPropertyTypes = ['name', 'type', 'required', 'rules', 'validator', 'ref', 'default', 'values', 'rulesMsg', 'immutable', 'feature']
 
 /**
  * Plugin factory

package/lib/collect-models.js

@@ -82,6 +82,7 @@ async function applyFeature (model, feature, options, indexes, isExtender) {
   if (item.rules) model.rules.push(...item.rules)
   if (!isArray(item.properties)) item.properties = [item.properties]
   for (const prop of item.properties) {
+    prop.feature = `${feature.plugin.ns}:${feature.name}`
     await sanitizeProp.call(this, model, prop, indexes)
   }
   if (item.hooks) {

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

@@ -1,10 +1,30 @@
 import path from 'path'
 
-async function loadFixtures ({ spinner } = {}) {
-  const { readConfig, eachPlugins, getPluginDataDir } = this.app.bajo
-  const { resolvePath } = this.app.lib.aneka
-  const { isEmpty, isArray, isString } = this.app.lib._
+async function exec ({ item, spinner, options, result, items } = {}) {
+  const { isArray, isString } = this.app.lib._
+  const { getPluginDataDir } = this.app.bajo
   const { fs } = this.app.lib
+  const resp = await this.createRecord(item, options)
+  if (isArray(item._attachments) && item._attachments.length > 0) {
+    for (let att of item._attachments) {
+      if (isString(att)) att = { field: 'file', file: att }
+      const fname = path.basename(att.file)
+      if (fs.existsSync(att.file)) {
+        const dest = `${getPluginDataDir(this.plugin.ns)}/${resp.id}/${att.field}/${fname}`
+        try {
+          fs.copySync(att.file, dest)
+        } catch (err) {}
+      }
+    }
+  }
+  result.success++
+  if (spinner) spinner.setText('recordsAdded%s%d%d', this.name, result.success, items.length)
+}
+
+async function loadFixtures ({ spinner, ignoreError = true, collectItems = false, noLookup = false } = {}, options = {}) {
+  const { readConfig, eachPlugins } = this.app.bajo
+  const { resolvePath } = this.app.lib.aneka
+  const { isEmpty, isArray, omit } = this.app.lib._
   if (this.connection.proxy) {
     this.log.warn('proxiedConnBound%s', this.name)
     return
@@ -26,47 +46,32 @@ async function loadFixtures ({ spinner } = {}) {
     const extend = await readConfig(`${dir}/extend/dobo/extend/${me.plugin.ns}/fixture/${base}.*`, { ns, ignoreError: true })
     if (isArray(extend) && !isEmpty(extend)) items.push(...extend)
   })
-  if (isEmpty(items)) return result
-  const opts = { noHook: true, noCache: true }
+  const opts = { noHook: true, noCache: true, ...(omit(options, ['noHook', 'noCache'])) }
   for (const item of items) {
-    try {
-      for (const k in item) {
-        const v = item[k]
-        if (typeof v === 'string' && v.slice(0, 2) === '?:') {
-          let [, model, field, ...query] = v.split(':')
-          if (!field) field = 'id'
-          const ref = this.app.dobo.getModel(model)
-          const recs = await ref.findRecord({ query: query.join(':') }, opts)
-          item[k] = (recs[0] ?? {})[field]
-        }
-        if (v === null) item[k] = undefined
-        else {
-          const prop = this.properties.find(item => item.name === k)
-          if (prop && ['string', 'text'].includes(prop.type)) item[k] += ''
-        }
-      }
-      const resp = await this.createRecord(item, { force: true })
-      if (isArray(item._attachments) && item._attachments.length > 0) {
-        for (let att of item._attachments) {
-          if (isString(att)) att = { field: 'file', file: att }
-          const fname = path.basename(att.file)
-          if (fs.existsSync(att.file)) {
-            const dest = `${getPluginDataDir(this.plugin.ns)}/${resp.id}/${att.field}/${fname}`
-            try {
-              fs.copySync(att.file, dest)
-            } catch (err) {}
-          }
-        }
+    for (const k in item) {
+      const v = item[k]
+      if (!noLookup && typeof v === 'string' && v.slice(0, 2) === '?:') item[k] = await this._simpleLookup(v.slice(2), opts)
+      if (v === null) item[k] = undefined
+      else {
+        const prop = this.properties.find(item => item.name === k)
+        if (prop && ['string', 'text'].includes(prop.type)) item[k] += ''
       }
-      result.success++
-      if (spinner) spinner.setText('recordsAdded%s%d%d', this.name, result.success, items.length)
-    } catch (err) {
-      console.log(err)
-      err.model = this.name
-      if (this.app.applet) this.plugin.print.fail(this.app.dobo.validationErrorMessage(err))
-      result.failed++
     }
   }
+  if (collectItems) return items
+  if (isEmpty(items)) return result
+  for (const item of items) {
+    if (ignoreError) {
+      try {
+        await exec.call(this, { item, spinner, opts, options, result, items })
+      } catch (err) {
+        // console.log(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, opts, options, result, items })
+  }
   return result
 }
 

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

@@ -49,14 +49,16 @@ async function updateRecord (...args) {
   let [id, body = {}, opts = {}] = args
   const { isSet } = this.app.lib.aneka
   const { runHook } = this.app.bajo
-  const { cloneDeep, get } = this.app.lib._
+  const { cloneDeep, get, omit } = this.app.lib._
   const { dataOnly = true } = opts
   const { options } = await getFilterAndOptions.call(this, null, opts, action)
   options.partial = options.partial ?? true
   const { truncateString, noResult, noBodySanitizer, noResultSanitizer, noValidation, partial } = options
   const extFields = get(options, 'validation.extFields', [])
   id = this.sanitizeId(id)
-  const input = noBodySanitizer ? cloneDeep(body) : await this.sanitizeBody({ body, extFields, strict: true, truncateString, partial, onlyTypes })
+  let input = noBodySanitizer ? cloneDeep(body) : await this.sanitizeBody({ body, extFields, strict: true, truncateString, partial, onlyTypes })
+  const immutables = this.properties.filter(prop => prop.immutable)
+  if (immutables.length > 0) input = omit(input, immutables)
   delete input.id
   await execHook.call(this, 'beforeUpdateRecord', id, input, options)
   await execModelHook.call(this, 'beforeUpdateRecord', id, input, options)

package/lib/factory/model.js

@@ -96,6 +96,24 @@ async function modelFactory () {
       return !!this.getProperty(name)
     }
 
+    _simpleLookup = async (value, options = {}) => {
+      const { get, isEmpty, isString, isPlainObject, isArray } = this.app.lib._
+      let model
+      let field
+      let query
+      if (isString(value)) {
+        [model, field, ...query] = value.split(':')
+        query = query.join(':')
+      } else if (isPlainObject(value)) ({ model, field, query } = value)
+      else if (isArray(value)) [model, field, query] = value
+      else return
+      if (isEmpty(field)) field = 'id'
+      const { getModel } = this.app.dobo
+      const ref = getModel(model)
+      const rec = await ref.findOneRecord({ query }, { noHook: true, noCache: true, ...options })
+      return get(rec, field)
+    }
+
     build = build
     exists = exists
     drop = drop

package/package.json

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

package/wiki/CHANGES.md

@@ -1,8 +1,16 @@
 # Changes
 
+## 2026-03-11
+
+- [2.10.0] Add ```immutable``` and ```feature``` to the list of allowed property keys
+- [2.10.0] Set ```property.feature``` to the name of feature name if property is build using ```feature```
+- [2.10.0] Add ```model._simpleLookup()```
+- [2.10.0] Refactor ```model.loadFixtures()```
+- [2.10.0] Add ```property.immutable``` for property that can't be updated
+
 ## 2026-03-09
 
-- [2.9.3] Bug fix in ```findAllRecord```
+- [2.9.3] Bug fix in ```model.findAllRecord```
 
 ## 2026-03-07