dobo 1.2.6 → 1.2.8

package/index.js

@@ -233,6 +233,7 @@ async function factory (pkgName) {
 
     buildMatch = ({ input = '', schema, options }) => {
       const { isPlainObject, trim } = this.lib._
+      if (isPlainObject(input)) return input
       const split = (value, schema) => {
         let [field, val] = value.split(':').map(i => i.trim())
         if (!val) {
@@ -241,7 +242,6 @@ async function factory (pkgName) {
         }
         return { field, value: val }
       }
-
       input = trim(input)
       let items = {}
       if (isPlainObject(input)) items = input
@@ -264,14 +264,28 @@ async function factory (pkgName) {
       return matcher
     }
 
-    buildQuery = async ({ filter, schema, options = {} } = {}) => {
-      const { trim, isString, isPlainObject } = this.lib._
+    buildQuery = ({ filter, schema, options = {} } = {}) => {
+      const { trim, find, isString, isPlainObject } = this.lib._
       let query = {}
       if (isString(filter.query)) {
         try {
-          filter.oquery = filter.query
+          filter.query = trim(filter.query)
+          filter.orgQuery = filter.query
           if (trim(filter.query).startsWith('{')) query = JSON.parse(filter.query)
-          else query = nql(filter.query).parse()
+          else if (filter.query.includes(':')) query = nql(filter.query).parse()
+          else {
+            const fields = schema.sortables.filter(f => {
+              const field = find(schema.properties, { name: f, type: 'string' })
+              return !!field
+            })
+            const parts = fields.map(f => {
+              if (filter.query[0] === '*') return `${f}:~$'${filter.query.replaceAll('*', '')}'`
+              if (filter.query[filter.length - 1] === '*') return `${f}:~^'${filter.query.replaceAll('*', '')}'`
+              return `${f}:~'${filter.query.replaceAll('*', '')}'`
+            })
+            if (parts.length === 1) query = nql(parts[0]).parse()
+            else if (parts.length > 1) query = nql(parts.join(',')).parse()
+          }
         } catch (err) {
           this.error('invalidQuery', { orgMessage: err.message })
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "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-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)