dobo 2.20.0 → 2.20.1

package/lib/collect-models.js

@@ -52,12 +52,12 @@ async function sanitizeProp (model, prop, indexes) {
  * @param {Array} [inputs] - Array of properties
  * @param {Array} [indexes] - Container array to fill up found index
  */
-async function findAllProps (model, inputs = [], indexes = [], isExtender) {
+async function findAllProps (model, inputs = [], indexes = []) {
   const { isPlainObject, cloneDeep } = this.app.lib._
   const isIdProp = inputs.find(p => {
     return isPlainObject(p) ? p.name === 'id' : p.startsWith('id,')
   })
-  if (!isExtender && !isIdProp) {
+  if (!isIdProp) {
     const idField = cloneDeep(model.connection.driver.idField)
     idField.name = 'id'
     inputs.unshift(idField)
@@ -74,7 +74,7 @@ async function findAllProps (model, inputs = [], indexes = [], isExtender) {
  * @param {Object} options - Options to the feature
  * @returns {Array} New properties found in feature
  */
-async function applyFeature (model, feature, options, indexes, isExtender) {
+async function applyFeature (model, feature, options, indexes) {
   const { isArray, findIndex } = this.app.lib._
   if (feature.name === 'dobo:unique' && options.field === 'id') {
     const idx = findIndex(model.properties, { name: 'id' })
@@ -103,14 +103,14 @@ async function applyFeature (model, feature, options, indexes, isExtender) {
  * @param {Object} model - Model
  * @param {Array} [inputs] - Array of properties
  */
-async function findAllFeats (model, inputs = [], indexes = [], isExtender) {
+async function findAllFeats (model, inputs = [], indexes = []) {
   const { isString, omit } = this.app.lib._
   for (let feat of inputs) {
     if (isString(feat)) feat = { name: feat }
     const featName = feat.name.indexOf(':') === -1 ? `dobo:${feat.name}` : feat.name
     const feature = this.app.dobo.getFeature(featName)
     if (!feature) this.fatal('invalidFeature%s%s', model.name, featName)
-    await applyFeature.call(this, model, feature, omit(feat, 'name'), indexes, isExtender)
+    await applyFeature.call(this, model, feature, omit(feat, 'name'), indexes)
   }
 }
 
@@ -235,9 +235,7 @@ export async function sanitizeAll (model) {
  * @returns {Object} Sanitized model
  */
 async function createSchema (item) {
-  const { readConfig } = this.app.bajo
-  const { fastGlob } = this.app.lib
-  const { find, isPlainObject, orderBy, get, cloneDeep } = this.app.lib._
+  const { find, orderBy, get } = this.app.lib._
   const { mergeObjectsByKey, defaultsDeep, parseObject } = this.app.lib.aneka
   if (item.file && !item.base) item.base = path.basename(item.file, path.extname(item.file))
   item.attachment = item.attachment ?? true
@@ -265,29 +263,18 @@ async function createSchema (item) {
     if (!item.connection && conn === 'default') item.connection = this.getConnection('memory')
   }
   if (!item.connection) this.fatal('unknownConn%s%s', conn, item.name)
-  const defCache = cloneDeep(get(this, 'app.bajoCache.config.default', this.config.default.cache))
-  item.cache = item.cache ?? item.connection.options.cache ?? defCache
-  if (item.cache === true) item.cache = get(item, 'connection.options.cache', defCache)
-  else if (item.cache === false) item.cache = { ttlDur: 0 }
-  item.cache = parseObject(defaultsDeep(get(this, `app.bajoCache.config.dobo.${item.name}`), item.cache))
+  // cache settings
+  const defCache = defaultsDeep({}, item.connection.options.cache, get(this, 'app.bajoCache.config.default', this.config.default.cache))
+  if (item.cache === false) item.cache = { ttlDur: 0 }
+  else if (item.cache === true) item.cache = defCache
+  else item.cache = defaultsDeep({}, item.cache, defCache)
+  item.cache = parseObject(item.cache)
+  if (item.connection.name === 'memory') item.cache.ttlDur = 0
+
+  // let's run
   await findAllProps.call(this, item, props, indexes)
   await findAllFeats.call(this, item, feats, indexes)
   await findAllIndexes.call(this, item, indexes)
-  // item extender
-  if (item.base) {
-    for (const ns of this.app.getAllNs()) {
-      const plugin = this.app[ns]
-      const glob = `${plugin.dir.pkg}/extend/dobo/extend/${item.ns}/model/${item.base}.*`
-      const files = await fastGlob(glob)
-      for (const file of files) {
-        const extender = await readConfig(file, { ns: plugin.ns, ignoreError: true })
-        if (!isPlainObject(extender)) this.plugin.fatal('invalidModelExtender%s%s', ns, item.name)
-        await findAllProps.call(this, item, extender.properties ?? [], indexes, true)
-        await findAllFeats.call(this, item, extender.features ?? [], indexes, true)
-        await findAllIndexes.call(this, item, extender.indexes ?? [], indexes, true)
-      }
-    }
-  }
   for (const key of ['properties', 'indexes']) {
     item[key] = mergeObjectsByKey(item[key], 'name')
   }
@@ -322,10 +309,11 @@ async function collectModels () {
 
     const base = path.basename(file, path.extname(file))
     const defName = pascalCase(`${this.alias} ${base}`)
-    const item = await readConfig(file, { ns: this.ns, ignoreError: true })
+    const item = await readConfig(file, { ns: this.ns, baseNs: me.ns })
     if (isEmpty(item)) return undefined
     if (!isPlainObject(item)) me.fatal('invalidModel%s', defName)
     item.name = item.name ?? defName
+    me.log.trace('- %s', item.name)
     item.collName = item.collName ?? item.name
     item.file = file
     item.ns = this.ns
@@ -344,7 +332,6 @@ async function collectModels () {
   }
   for (const model of me.models) {
     await sanitizeRef.call(this, model, me.models)
-    me.log.trace('- %s', model.name)
   }
   this.log.debug('collected%s%d', this.t('model'), this.models.length)
 }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 2026-04-23
+
+- [2.20.1] Bug fix in ```collect-models.js```, now with deep merge in advance
+
 ## 2026-04-21
 
 - [2.19.1] Bug fix in ```collect-models.js```, now values are sanitized with ```parseObject()```