dobo 1.0.8 → 1.0.10

package/bajo/method/record/count.js

@@ -0,0 +1,38 @@
+import resolveMethod from '../../../lib/resolve-method.js'
+
+async function count (name, filter = {}, opts = {}) {
+  const { runHook } = this.app.bajo
+  const { get, set } = this.cache ?? {}
+  const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
+  const options = cloneDeep(omit(opts, ['req']))
+  options.req = opts.req
+  options.dataOnly = options.dataOnly ?? true
+  let { dataOnly, noHook, noCache } = options
+  options.dataOnly = false
+  await this.modelExists(name, true)
+  const { handler, schema, driver } = await resolveMethod.call(this, name, 'record-count', options)
+  if (!schema.cacheable) noCache = true
+  filter.query = await this.buildQuery({ filter, schema, options }) ?? {}
+  if (options.queryHandler) filter.query = await options.queryHandler.call(opts.req ? this.app[opts.req.ns] : this, filter.query, opts.req)
+  filter.match = this.buildMatch({ input: filter.match, schema, options }) ?? {}
+  if (!noHook) {
+    await runHook(`${this.name}:beforeRecordCount`, name, filter, options)
+    await runHook(`${this.name}.${camelCase(name)}:beforeRecordCount`, filter, options)
+  }
+  if (get && !noCache) {
+    const cachedResult = await get({ model: name, filter, options })
+    if (cachedResult) {
+      cachedResult.cached = true
+      return dataOnly ? cachedResult.data : cachedResult
+    }
+  }
+  const count = await handler.call(this.app[driver.ns], { schema, filter, options })
+  if (!noHook) {
+    await runHook(`${this.name}.${camelCase(name)}:afterRecordFind`, filter, options, count)
+    await runHook(`${this.name}:afterRecordFind`, name, filter, options, count)
+  }
+  if (set && !noCache) await set({ model: name, filter, options, count })
+  return dataOnly ? count.data : count
+}
+
+export default count

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.8",
+  "version": "1.0.10",
   "description": "Database ORM/ODM for Bajo Framework",
   "main": "index.js",
   "scripts": {