dobo 1.2.8 → 1.2.10

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: {

package/lib/multi-rel-rows.js

@@ -30,7 +30,7 @@ async function multiRelRows ({ schema, records, options = {} }) {
         for (const i in records) {
           records[i]._rel = records[i]._rel ?? {}
           const rec = records[i]
-          const res = results.find(r => (r[val.propName] + '') === rec[prop.name])
+          const res = results.find(r => (r[val.propName] + '') === rec[prop.name] + '')
           if (res) records[i]._rel[key] = await this.pickRecord({ record: res, fields, schema: relschema })
           else records[i]._rel[key] = {}
         }

package/package.json

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

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