dobo 2.39.1 → 2.40.0

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execValidation, execModelHook, execDynHook, getRefs, handleReq } from './helper.js'
+import { getFilterAndOptions, execHook, execValidation, execModelHook, execDynHook, getRefs, getAttachments, handleReq } from './helper.js'
 
 export const onlyTypes = ['datetime', 'date', 'time', 'timestamp', 'array', 'object']
 const action = 'createRecord'
@@ -39,6 +39,7 @@ async function createRecord (...args) {
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (isSet(options.refs)) await getRefs.call(this, [result.data], options)
+  if (options.attachments) await getAttachments.call(this, [result.data], options)
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await execDynHook.call(this, 'afterCreateRecord', input, result, options)
   await execModelHook.call(this, 'afterCreateRecord', input, result, options)

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

@@ -1,4 +1,4 @@
-import { getRefs, execHook, execModelHook, execDynHook, getFilterAndOptions, cloneOptions, sanitizeQuery } from './helper.js'
+import { getRefs, getAttachments, execHook, execModelHook, execDynHook, getFilterAndOptions, cloneOptions, sanitizeQuery } from './helper.js'
 const action = 'findAllRecord'
 
 async function native (...args) {
@@ -42,6 +42,7 @@ async function native (...args) {
   if (!warnings) delete result.warnings
 
   if (isSet(options.refs)) await getRefs.call(this, result.data, options)
+  if (options.attachments) await getAttachments.call(this, result.data, options)
   if (!noResultSanitizer) {
     for (const idx in result.data) {
       result.data[idx] = await this.sanitizeRecord(result.data[idx], options)

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook, getRefs, sanitizeQuery } from './helper.js'
+import { getFilterAndOptions, execHook, execModelHook, execDynHook, getRefs, sanitizeQuery, getAttachments } from './helper.js'
 const action = 'findRecord'
 
 /**
@@ -67,6 +67,7 @@ async function findRecord (...args) {
   result.pages = options.count ? Math.ceil(result.count / filter.limit) : undefined
   if (!warnings) delete result.warnings
   if (isSet(options.refs)) await getRefs.call(this, result.data, options)
+  if (options.attachments) await getAttachments.call(this, result.data, options)
   if (!noResultSanitizer) {
     for (const idx in result.data) {
       result.data[idx] = await this.sanitizeRecord(result.data[idx], options)

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook, getRefs } from './helper.js'
+import { getFilterAndOptions, execHook, execModelHook, execDynHook, getRefs, getAttachments } from './helper.js'
 const action = 'getRecord'
 
 /**
@@ -41,6 +41,7 @@ async function getRecord (...args) {
   if (!warnings) delete result.warnings
   if (isEmpty(result.data) && !options.throwNotFound) return dataOnly ? undefined : { data: undefined }
   if (isSet(options.refs)) await getRefs.call(this, [result.data], options)
+  if (options.attachments) await getAttachments.call(this, [result.data], options)
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await execDynHook.call(this, 'afterGetRecord', id, result, options)
   await execModelHook.call(this, 'afterGetRecord', id, result, options)

package/lib/factory/model/helper.js

@@ -283,6 +283,21 @@ export async function handleAttachmentUpload (id, trigger, options = {}) {
   return copyAttachment.call(this, id, { req, mimeType, stats, setFile, setField })
 }
 
+/**
+ * Get attachments for the given records.
+ * @async
+ * @memberof module:Helper/Model
+ * @method
+ * @name getAttachments
+ * @returns {Promise<void>}
+ * @param {Array<Object>} records - The records to get attachments for.
+ */
+export async function getAttachments (records = []) {
+  for (const rec of records) {
+    rec._attachments = await this.listAttachment({ id: rec.id })
+  }
+}
+
 /**
  * Gets reference records for the given records.
  * @async
@@ -336,8 +351,11 @@ export async function getRefs (records = [], options = {}) {
             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 ? [] : {}
             else records[i]._ref[key] = isValues ? res : res[0]
+            */
+            if (res.length > 0) records[i]._ref[key] = isValues ? (res ?? []) : (res[0] ?? {})
           }
         } catch (err) {
           if (this.app.bajo.config.log.level === 'trace') console.error(err)

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook, getRefs, handleReq, clearCache } from './helper.js'
+import { getFilterAndOptions, execHook, execModelHook, execDynHook, getRefs, getAttachments, handleReq, clearCache } from './helper.js'
 const action = 'removeRecord'
 
 /**
@@ -34,7 +34,8 @@ async function removeRecord (...args) {
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (!noResultSanitizer) result.oldData = await this.sanitizeRecord(result.oldData, options)
-  if (isSet(options.refs)) await getRefs.call(this, [result.data], options)
+  if (isSet(options.refs)) await getRefs.call(this, [result.oldData], options)
+  if (options.attachments) await getAttachments.call(this, [result.oldData], options)
   await execDynHook.call(this, 'afterRemoveRecord', id, result, options)
   await execModelHook.call(this, 'afterRemoveRecord', id, result, options)
   await execHook.call(this, 'afterRemoveRecord', id, result, options)

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

@@ -33,6 +33,7 @@ async function sanitizeRecord (record = {}, opts = {}) {
   const body = fillObject(record, newFields, null)
   const newRecord = await this.sanitizeBody({ body, partial: true, noDefault: true, allProps: true })
   if (record._ref) newRecord._ref = cloneDeep(record._ref)
+  if (record._attachments) newRecord._attachments = cloneDeep(record._attachments)
   for (const key in newRecord) {
     const prop = this.getProperty(key)
     if (!prop) continue

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execValidation, execModelHook, execDynHook, getRefs, handleReq, clearCache } from './helper.js'
+import { getFilterAndOptions, execHook, execValidation, execModelHook, execDynHook, getRefs, getAttachments, handleReq, clearCache } from './helper.js'
 import { onlyTypes } from './create-record.js'
 const action = 'updateRecord'
 
@@ -45,6 +45,7 @@ async function updateRecord (...args) {
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (isSet(options.refs)) await getRefs.call(this, [result.data], options)
+  if (options.attachments) await getAttachments.call(this, [result.data], options)
   if (!noResultSanitizer) {
     result.data = await this.sanitizeRecord(result.data, options)
     result.oldData = await this.sanitizeRecord(result.oldData, options)

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

@@ -1,4 +1,4 @@
-import { getFilterAndOptions, execHook, execModelHook, execDynHook, execValidation, getRefs, handleReq, clearCache } from './helper.js'
+import { getFilterAndOptions, execHook, execModelHook, execDynHook, execValidation, getRefs, getAttachments, handleReq, clearCache } from './helper.js'
 const action = 'upsertRecord'
 
 async function native (body = {}, opts = {}) {
@@ -22,6 +22,7 @@ async function native (body = {}, opts = {}) {
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (isSet(options.refs)) await getRefs.call(this, [result.data], options)
+  if (options.attachments) await getAttachments.call(this, [result.data], options)
   if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await execDynHook.call(this, 'afterUpsertRecord', input, result, options)
   await execModelHook.call(this, 'afterUpsertRecord', input, result, options)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+
+## 2026-10-21
+
+- [2.40.0] Add `helper.getAttachments()`
+- [2.40.0] Auto attach `_attachments` if `options.attachments` is true
+
+## 2026-10-17
+
+- [2.39.2] Bug fix in `helper.getRefs()`
+
 ## 2026-09-06
 
 - [2.39.1] Bug fix in `helper.getRefs()`