dobo 1.1.13 → 1.1.15

package/lib/sanitize-schema.js

@@ -21,7 +21,9 @@ async function sanitizeFeature (item) {
 }
 
 async function sanitizeIndexes (item) {
+  const { generateId } = this.app.bajo
   for (const idx of item.indexes) {
+    if (!idx.name) idx.name = `${(item.collName ?? item.name).toUpperCase()}_${generateId()}`
     if (!(typeof idx.fields === 'string' || Array.isArray(idx.fields))) this.fatal('onlyAcceptFields%s%s', 'indexes', item.name)
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "Database ORM/ODM for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/plugin/method/record/create.js

@@ -56,13 +56,13 @@ async function create (name, input, opts = {}) {
     if (options.req.file) await handleAttachmentUpload.call(this, { name: schema.name, id: body.id, body, options, action: 'create' })
     if (options.req.flash && !options.noFlash) options.req.flash('notify', options.req.t('recordCreated'))
   }
+  if (clearModel) await clearModel({ model: name, body: nbody, options, record })
+  if (noResult) return
+  record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordCreate`, nbody, options, record)
     await runHook(`${this.name}:afterRecordCreate`, name, nbody, options, record)
   }
-  if (clearModel) await clearModel({ model: name, body: nbody, options, record })
-  if (noResult) return
-  record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
   if (!noFeatureHook) await execFeatureHook.call(this, 'afterCreate', { schema, body: nbody, options, record })
   return dataOnly ? record.data : record
 }

package/plugin/method/record/find-one.js

@@ -39,11 +39,11 @@ async function findOne (name, filter = {}, opts = {}) {
   record.data = record.data[0]
 
   if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
+  record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordFindOne`, filter, options, record)
     await runHook(`${this.name}:afterRecordFindOne`, name, filter, options, record)
   }
-  record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
   if (set && !noCache) await set({ model: name, filter, options, record })
   if (!noFeatureHook) await execFeatureHook.call(this, 'afterFindOne', { schema, filter, options, record })
   return dataOnly ? record.data : record

package/plugin/method/record/find.js

@@ -36,13 +36,13 @@ async function find (name, filter = {}, opts = {}) {
   const records = options.records ?? (await handler.call(this.app[driver.ns], { schema, filter, options }))
   delete options.records
   if (isSet(options.rels)) await multiRelRows.call(this, { schema, records: records.data, options })
+  for (const idx in records.data) {
+    records.data[idx] = await this.pickRecord({ record: records.data[idx], fields, schema, hidden, forceNoHidden })
+  }
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordFind`, filter, options, records)
     await runHook(`${this.name}:afterRecordFind`, name, filter, options, records)
   }
-  for (const idx in records.data) {
-    records.data[idx] = await this.pickRecord({ record: records.data[idx], fields, schema, hidden, forceNoHidden })
-  }
   if (set && !noCache) await set({ model: name, filter, options, records })
   if (!noFeatureHook) await execFeatureHook.call(this, 'afterFind', { schema, filter, options, records })
   return dataOnly ? records.data : records

package/plugin/method/record/get.js

@@ -33,12 +33,11 @@ async function get (name, id, opts = {}) {
   const record = options.record ?? (await handler.call(this.app[driver.ns], { schema, id, options }))
   delete options.record
   if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
+  record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordGet`, id, options, record)
     await runHook(`${this.name}:afterRecordGet`, name, id, options, record)
   }
-  record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
-
   if (set && !noCache) await set({ model: name, id, options, record })
   if (!noFeatureHook) await execFeatureHook.call(this, 'afterGet', { schema, id, options, record })
   return dataOnly ? record.data : record

package/plugin/method/record/remove.js

@@ -27,13 +27,13 @@ async function remove (name, id, opts = {}) {
     if (options.req.file) await handleAttachmentUpload.call(this, { name: schema.name, id, options, action: 'remove' })
     if (options.req.flash && !options.noFlash) options.req.flash('notify', options.req.t('recordRemoved'))
   }
+  if (clearModel) await clearModel({ model: name, id, options, record })
+  if (noResult) return
+  record.oldData = options.record ? options.record.oldData : (await this.pickRecord({ record: record.oldData, fields, schema, hidden, forceNoHidden }))
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordRemove`, id, options, record)
     await runHook(`${this.name}:afterRecordRemove`, name, id, options, record)
   }
-  if (clearModel) await clearModel({ model: name, id, options, record })
-  if (noResult) return
-  record.oldData = options.record ? options.record.oldData : (await this.pickRecord({ record: record.oldData, fields, schema, hidden, forceNoHidden }))
   if (!noFeatureHook) await execFeatureHook.call(this, 'afterRemove', { schema, id, options, record })
   return dataOnly ? record.oldData : record
 }

package/plugin/method/record/update.js

@@ -47,14 +47,14 @@ async function update (name, id, input, opts = {}) {
     if (options.req.file) await handleAttachmentUpload.call(this, { name: schema.name, id, body, options, action: 'update' })
     if (options.req.flash && !options.noFlash) options.req.flash('notify', options.req.t('recordUpdated'))
   }
-  if (!noHook) {
-    await runHook(`${this.name}.${camelCase(name)}:afterRecordUpdate`, id, nbody, options, record)
-    await runHook(`${this.name}:afterRecordUpdate`, name, id, nbody, options, record)
-  }
   if (clearModel) await clearModel({ model: name, id, body: nbody, options, record })
   if (noResult) return
   record.oldData = await this.pickRecord({ record: record.oldData, fields, schema, hidden, forceNoHidden })
   record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
+  if (!noHook) {
+    await runHook(`${this.name}.${camelCase(name)}:afterRecordUpdate`, id, nbody, options, record)
+    await runHook(`${this.name}:afterRecordUpdate`, name, id, nbody, options, record)
+  }
   if (!noFeatureHook) await execFeatureHook.call(this, 'afterUpdate', { schema, body: nbody, record })
   return dataOnly ? record.data : record
 }