dobo 2.2.0 → 2.2.2

package/index.js

@@ -67,22 +67,10 @@ const propertyType = {
     validator: 'boolean',
     rules: []
   },
-  date: {
-    validator: 'date',
-    rules: []
-  },
   datetime: {
     validator: 'date',
     rules: []
   },
-  time: {
-    validator: 'date',
-    rules: []
-  },
-  timestamp: {
-    validator: 'timestamp',
-    rules: []
-  },
   object: {
     validator: null,
     rules: []

package/lib/collect-models.js

@@ -304,13 +304,15 @@ async function collectModels () {
   for (const schema of schemas) {
     const plugin = this.app[schema.ns]
     delete schema.ns
-    await sanitizeRef.call(this, schema, schemas, true)
     const idProp = schema.properties.find(p => p.name === 'id')
     if (!this.constructor.idTypes.includes(idProp.type)) this.fatal('invalidIdType%s%s', schema.name, this.constructor.idTypes.join(', '))
     if (idProp.type === 'string' && !has(idProp, 'maxLength')) idProp.maxLength = 50
     // schema.properties = without(schema.properties, undefined)
     const model = new DoboModel(plugin, schema)
     me.models.push(model)
+  }
+  for (const model of me.models) {
+    await sanitizeRef.call(this, model, me.models, true)
     me.log.trace('- %s', model.name)
   }
   this.log.debug('collected%s%d', this.t('model'), this.models.length)

package/lib/factory/driver.js

@@ -34,7 +34,8 @@ async function driverFactory () {
           array: false,
           datetime: true
         },
-        uniqueIndex: false
+        uniqueIndex: false,
+        nullableField: true
       }
       this.memory = false
       this.options = options
@@ -57,6 +58,17 @@ async function driverFactory () {
         delete item.id
       }
       for (const prop of model.properties) {
+        if (!isSet(item[prop.name]) && !this.support.nullableField) {
+          switch (prop.type) {
+            case 'datetime': item[prop.name] = new Date(0); break
+            case 'float':
+            case 'double': item[prop.name] = 0; break
+            case 'string':
+            case 'text': item[prop.name] = ''; break
+            case 'object': item[prop.name] = {}; break
+            case 'array': item[prop.name] = []; break
+          }
+        }
         if (isSet(item[prop.name]) && !this.support.propType[prop.type]) {
           if (prop.type === 'datetime') item[prop.name] = item[prop.name].toISOString()
           else if (['object', 'array'].includes(prop.type)) item[prop.name] = JSON.stringify(item[prop.name])
@@ -200,7 +212,9 @@ async function driverFactory () {
       const resp = await this.getRecord(model, id, { noHook: true })
       if (!resp.data) throw this.plugin.error('recordNotFound%s%s', id, model.name)
       options._data = resp.data
-      const result = await this.updateRecord(model, id, this.sanitizeBody(model, body), options)
+      const input = this.sanitizeBody(model, body)
+      delete input.id
+      const result = await this.updateRecord(model, id, input, options)
       if (options.noResult) return
       result.oldData = this.sanitizeRecord(model, result.oldData)
       result.data = this.sanitizeRecord(model, result.data)

package/lib/factory/model/_util.js

@@ -151,7 +151,7 @@ export async function getSingleRef (record = {}, options = {}) {
         if (!((typeof options.refs === 'string' && ['*', 'all'].includes(options.refs)) || options.refs.includes(key))) continue
         const ref = prop.ref[key]
         if (ref.fields.length === 0) continue
-        const rModel = this.plugin.getModel(key)
+        const rModel = this.app.dobo.getModel(ref.model)
         const query = {}
         query[ref.propName] = record[prop.name]
         if (ref.propName === 'id') query[ref.propName] = this.sanitizeId(query[ref.propName])
@@ -182,7 +182,7 @@ export async function getMultiRefs (records = [], options = {}) {
         const ref = prop.ref[key]
         if (ref.fields.length === 0) continue
         if (ref.type !== '1:1') continue
-        const rModel = this.plugin.getModel(key)
+        const rModel = this.app.dobo.getModel(ref.model)
         const matches = uniq(map(records, r => {
           let v = r[prop.name]
           if (ref.propName === 'id') v = this.sanitizeId(v)

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

@@ -24,7 +24,7 @@ async function createRecord (...args) {
   }
   result = result ?? {}
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
-  if (isSet(options.refs)) await getSingleRef.call(this, { record: result.data, options })
+  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
   await handleReq.call(this, result.data.id, 'created', options)
   await execModelHook.call(this, 'afterCreateRecord', input, result, options)
   await execHook.call(this, 'afterCreateRecord', input, result, options)

package/lib/factory/model/find-all-record.js

@@ -23,7 +23,7 @@ async function native (filter, options, dataOnly) {
       result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
     }
   }
-  if (isSet(options.refs)) await getMultiRefs.call(this, { records: result.data, options })
+  if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
   await execModelHook.call(this, 'afterFindAllRecord', filter, result, options)
   await execHook.call(this, 'afterFindAllRecord', filter, result, options)
   if (set && !noCache) await set({ model: this.name, filter, options, result })

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

@@ -93,7 +93,7 @@ async function findRecord (...args) {
       result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
     }
   }
-  if (isSet(options.refs)) await getMultiRefs.call(this, { records: result.data, options })
+  if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
   await execModelHook.call(this, 'afterFindRecord', filter, result, options)
   await execHook.call(this, 'afterFindRecord', filter, result, options)
   if (!noCache) await runHook('cache:setByFilter', this, filter, result)

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

@@ -69,7 +69,7 @@ async function getRecord (...args) {
   const result = options.record ?? (await this.driver._getRecord(this, id, options)) ?? {}
   if (isEmpty(result.data) && !options.throwNotFound) return dataOnly ? undefined : { data: undefined }
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
-  if (isSet(options.refs)) await getSingleRef.call(this, { record: result.data, options })
+  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
   await execModelHook.call(this, 'afterGetRecord', id, result.data, options)
   await execHook.call(this, 'afterGetRecord', id, result, options)
   if (!noCache) await runHook('cache:setById', this, id, result)

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

@@ -48,7 +48,7 @@ async function removeRecord (...args) {
     return
   }
   if (!noResultSanitizer) result.oldData = await this.sanitizeRecord(result.oldData, options)
-  if (isSet(options.refs)) await getSingleRef.call(this, { record: result.data, options })
+  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
   await handleReq.call(this, result.oldData.id, 'removed', options)
   await execModelHook.call(this, 'afterRemoveRecord', id, result, options)
   await execHook.call(this, 'afterRemoveRecord', id, result, options)

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

@@ -16,7 +16,7 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
   const { isSet } = this.app.lib.aneka
   const { callHandler } = this.app.bajo
   const { omit, has, isString, isNaN } = this.app.lib._
-  const { sanitizeBoolean, sanitizeDate, sanitizeFloat, sanitizeTimestamp, sanitizeInt, sanitizeObject, sanitizeString } = this.app.dobo
+  const { sanitizeBoolean, sanitizeDate, sanitizeFloat, sanitizeInt, sanitizeObject, sanitizeString } = this.app.dobo
   const result = {}
 
   const sanitize = (name, type) => {
@@ -25,14 +25,8 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
     else if (type === 'boolean') result[name] = sanitizeBoolean(result[name])
     else if (['float', 'double'].includes(type)) result[name] = sanitizeFloat(result[name], strict)
     else if (['integer', 'smallint'].includes(type)) result[name] = sanitizeInt(result[name], strict)
-    else if (type === 'timestamp') result[name] = sanitizeTimestamp(result[name])
     else if (['string', 'text'].includes(type)) result[name] = sanitizeString(result[name], strict)
-    else {
-      for (const t of ['datetime|native', 'date|YYYY-MM-DD', 'time|HH:mm:ss']) {
-        const [ptype, input] = t.split('|')
-        if (ptype === type) result[name] = sanitizeDate(result[name], { input })
-      }
-    }
+    else if (['datetime'].includes(type)) result[name] = sanitizeDate(result[name], { input: 'native' })
     if (!strict && isNaN(result[name])) result[name] = null
     if (['updateRecord', 'upsertRecord'].includes(action) && type === 'string' && result[name] === '') result[name] = null
   }

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

@@ -70,7 +70,7 @@ async function updateRecord (...args) {
     result.data = await this.sanitizeRecord(result.data, options)
     result.oldData = await this.sanitizeRecord(result.oldData, options)
   }
-  if (isSet(options.refs)) await getSingleRef.call(this, { record: result.data, options })
+  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
   await handleReq.call(this, result.data.id, 'updated', options)
   await execModelHook.call(this, 'afterUpdateRecord', id, input, result, options)
   await execHook.call(this, 'afterUpdateRecord', id, input, result, options)

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

@@ -19,7 +19,7 @@ async function native (body = {}, opts = {}) {
     return
   }
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
-  if (isSet(options.refs)) await getSingleRef.call(this, { record: result.data, options })
+  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
   await handleReq.call(this, result.data.id, 'upserted', options)
   await execModelHook.call(this, 'afterUpsertRecord', input, result, options)
   await execHook.call(this, 'afterUpsertRecord', input, result, options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "DBMS for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -34,7 +34,7 @@
   "dependencies": {
     "@tryghost/nql": "^0.12.7",
     "joi": "^18.0.2",
-    "mingo": "^7.1.0",
+    "mingo": "^6.5.1",
     "ulid": "^3.0.2",
     "uuid": "^13.0.0"
   },

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-01-18
+
+- [2.2.2] Revert back to ```mingo@6.5.1``` because of bugs in ```skip``` operation
+
+## 2026-01-16
+
+- [2.2.1] Bug fix on model references
+
 ## 2026-01-11
 
 - [2.2.0] Any driver that support memory DB can now declare itself as in-memory DB and be handled as such