dobo 1.0.7 → 1.0.9

package/bajo/method/record/create.js

@@ -1,3 +1,4 @@
+import crypto from 'crypto'
 import resolveMethod from '../../../lib/resolve-method.js'
 import checkUnique from '../../../lib/check-unique.js'
 import handleAttachmentUpload from '../../../lib/handle-attachment-upload.js'
@@ -7,7 +8,7 @@ import execFeatureHook from '../../../lib/exec-feature-hook.js'
 async function create (name, input, opts = {}) {
   const { generateId, runHook, isSet } = this.app.bajo
   const { clearModel } = this.cache ?? {}
-  const { find, forOwn, cloneDeep, camelCase, omit, get } = this.app.bajo.lib._
+  const { find, forOwn, cloneDeep, camelCase, omit, get, pick } = this.app.bajo.lib._
   const options = cloneDeep(omit(opts, ['req']))
   options.req = opts.req
   options.dataOnly = options.dataOnly ?? true
@@ -19,15 +20,21 @@ async function create (name, input, opts = {}) {
   const { handler, schema, driver } = await resolveMethod.call(this, name, 'record-create', options)
   const idField = find(schema.properties, { name: 'id' })
   const extFields = get(options, 'validation.extFields', [])
-  if (!isSet(input.id)) {
-    if (idField.type === 'string') input.id = generateId()
-    else if (['integer', 'smallint'].includes(idField.type) && !idField.autoInc) input.id = generateId('int')
-  }
-  let body = noSanitize ? input : await this.sanitizeBody({ body: input, schema, extFields, strict: true })
+  let body = noSanitize ? cloneDeep(input) : await this.sanitizeBody({ body: input, schema, extFields, strict: true })
   if (!noHook) {
     await runHook(`${this.name}:beforeRecordCreate`, name, body, options)
     await runHook(`${this.name}.${camelCase(name)}:beforeRecordCreate`, body, options)
   }
+  if (!isSet(body.id)) {
+    if (idField.type === 'string') {
+      if (!options.checksumId) body.id = generateId()
+      else {
+        if (options.checksumId === true) options.checksumId = Object.keys(body)
+        const checksum = pick(body, options.checksumId)
+        body.id = crypto.createHash('md5').update(JSON.stringify(checksum)).digest('hex')
+      }
+    } else if (['integer', 'smallint'].includes(idField.type) && !idField.autoInc) input.id = generateId('int')
+  }
   if (!noFeatureHook) await execFeatureHook.call(this, 'beforeCreate', { schema, body })
   if (!noValidation) body = await execValidation.call(this, { name, body, options })
   if (isSet(body.id) && !noCheckUnique) await checkUnique.call(this, { schema, body })

package/lib/add-fixtures.js

@@ -18,9 +18,8 @@ async function addFixture (name, { spinner } = {}) {
   const overrides = await readConfig(`${getPluginDataDir(this.name)}/override/fixture/${schema.name}.*`, { ns: this.name, ignoreError: true })
   if (isArray(overrides) && !isEmpty(overrides)) items = overrides
   // extend
-  const me = this
   await eachPlugins(async function ({ dir, ns }) {
-    const extend = await readConfig(`${dir}/${me.name}/extend/fixture/${schema.name}.*`, { ns, ignoreError: true })
+    const extend = await readConfig(`${dir}/dobo/extend/${schema.ns}/fixture/${base}.*`, { ns, ignoreError: true })
     if (isArray(extend) && !isEmpty(extend)) items.push(...extend)
   })
   if (isEmpty(items)) return result

package/lib/collect-schemas.js

@@ -33,7 +33,7 @@ async function handler ({ file, alias, ns }) {
   if ((mod.properties ?? []).length === 0) this.fatal('Schema \'%s\' doesn\'t have properties at all', mod.name)
   // schema extender
   await eachPlugins(async function (opts) {
-    const glob = `${opts.dir}/dobo/extend/schema/${mod.name}.*`
+    const glob = `${opts.dir}/dobo/extend/${mod.ns}/schema/${base}.*`
     const files = await fastGlob(glob)
     for (const file of files) {
       const extender = await readConfig(file, { ns: opts.ns, ignoreError: true })

package/package.json

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