dobo 1.2.7 → 1.2.9

package/index.js

@@ -34,6 +34,7 @@ async function factory (pkgName) {
           filter: {
             limit: 25,
             maxLimit: 200,
+            hardLimit: 10000,
             sort: ['dt:-1', 'updatedAt:-1', 'updated_at:-1', 'createdAt:-1', 'createdAt:-1', 'ts:-1', 'username', 'name']
           },
           idField: {
@@ -264,7 +265,7 @@ async function factory (pkgName) {
       return matcher
     }
 
-    buildQuery = async ({ filter, schema, options = {} } = {}) => {
+    buildQuery = ({ filter, schema, options = {} } = {}) => {
       const { trim, find, isString, isPlainObject } = this.lib._
       let query = {}
       if (isString(filter.query)) {

package/package.json

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

package/plugin-method/record/count.js

@@ -15,7 +15,7 @@ async function count (name, filter = {}, opts = {}) {
   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 }) ?? {}
+  filter.query = 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) {

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

@@ -1,14 +1,22 @@
 async function findAll (name, filter = {}, options = {}) {
+  const { maxLimit, hardLimit } = this.config.default.filter
   filter.page = 1
-  filter.limit = 100
+  filter.limit = maxLimit
   options.dataOnly = true
   const match = filter.match
   const all = []
+  let count = 0
   for (;;) {
     filter.match = match
     const results = await this.recordFind(name, filter, options)
     if (results.length === 0) break
+    if (count + results.length > hardLimit) {
+      const sliced = results.slice(0, hardLimit - count)
+      all.push(...sliced)
+      break
+    }
     all.push(...results)
+    count = count + results.length
     filter.page++
   }
   return all

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

@@ -20,7 +20,7 @@ async function findOne (name, filter = {}, opts = {}) {
   filter.page = 1
   const { handler, schema, driver } = await resolveMethod.call(this, name, 'record-find', options)
   if (!schema.cacheable) noCache = true
-  filter.query = await this.buildQuery({ filter, schema, options }) ?? {}
+  filter.query = 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) {

package/plugin-method/record/find.js

@@ -18,7 +18,7 @@ async function find (name, filter = {}, opts = {}) {
   await this.modelExists(name, true)
   const { handler, schema, driver } = await resolveMethod.call(this, name, 'record-find', options)
   if (!schema.cacheable) noCache = true
-  filter.query = await this.buildQuery({ filter, schema, options }) ?? {}
+  filter.query = 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) {

package/plugin-method/stat/aggregate.js

@@ -10,7 +10,7 @@ async function aggregate (name, filter = {}, options = {}) {
     await runHook(`${this.name}:beforeStatAggregate`, name, aggregate, filter, options)
     await runHook(`${this.name}.${name}:beforeStatAggregate`, aggregate, filter, options)
   }
-  filter.query = await this.buildQuery({ filter, schema, options }) ?? {}
+  filter.query = this.buildQuery({ filter, schema, options }) ?? {}
   filter.match = this.buildMatch({ input: filter.match, schema, options }) ?? {}
   const rec = await handler.call(this.app[driver.ns], { schema, filter, options })
   if (!noHook) {

package/plugin-method/stat/histogram.js

@@ -9,7 +9,7 @@ async function histogram (name, filter = {}, options = {}) {
   if (!types.includes(type)) throw this.error('histogramTypeMusBe%s', join(types))
   await this.modelExists(name, true)
   const { handler, schema, driver } = await resolveMethod.call(this, name, 'stat-histogram', options)
-  filter.query = await this.buildQuery({ filter, schema, options }) ?? {}
+  filter.query = this.buildQuery({ filter, schema, options }) ?? {}
   filter.match = this.buildMatch({ input: filter.match, schema, options }) ?? {}
   if (!noHook) {
     await runHook(`${this.name}:beforeStatHistogram`, name, type, filter, options)