dobo 1.1.7 → 1.1.9

package/bajo/intl/en-US.json

@@ -121,6 +121,7 @@
   "fixtureAdded%s%s%s": "Fixture on '%s': added %s, rejected: %s",
   "errorAddingFixture%s%s": "Error adding fixture on model '%s': %s",
   "memoryDbSkipped%s": "'%s' is a memory DB, skipped",
+  "db": "DB",
   "field": {
     "id": "ID",
     "code": "Kode",

package/bajo/intl/id.json

@@ -114,6 +114,7 @@
   "addingFixtureToMemDb": "Adding fixture for memory database",
   "recordsAdded%s%d%d": "%s: %d of %d records added",
   "driverInstantiated%s%s": "- Driver '%s:%s' instantiated",
+  "db": "DB",
   "field": {
     "id": "ID",
     "code": "Kode",

package/package.json

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

package/plugin/factory.js

@@ -271,7 +271,37 @@ async function factory (pkgName) {
         if (trim(filter.query).startsWith('{')) query = JSON.parse(filter.query)
         else query = nql(filter.query).parse()
       } else if (isPlainObject(filter.query)) query = filter.query
-      return query
+      return this.sanitizeQuery(query, schema)
+    }
+
+    sanitizeQuery = (query, schema, parent) => {
+      const { cloneDeep, isPlainObject, isArray, find } = this.lib._
+      const { isSet } = this.app.bajo
+      const { dayjs } = this.lib
+      const obj = cloneDeep(query)
+      const keys = Object.keys(obj)
+      const sanitize = (key, val, p) => {
+        if (!isSet(val)) return val
+        const prop = find(schema.properties, { name: key.startsWith('$') ? p : key })
+        if (!prop) return val
+        if (['datetime', 'date', 'time'].includes(prop.type)) {
+          const dt = dayjs(val)
+          return dt.isValid() ? dt.toDate() : val
+        } else if (['smallint', 'integer'].includes(prop.type)) return parseInt(val) || val
+        else if (['float', 'double'].includes(prop.type)) return parseFloat(val) || val
+        else if (['boolean'].includes(prop.type)) return !!val
+        return val
+      }
+      keys.forEach(k => {
+        const v = obj[k]
+        if (isPlainObject(v)) obj[k] = this.sanitizeQuery(v, schema, k)
+        else if (isArray(v)) {
+          v.forEach((i, idx) => {
+            if (isPlainObject(i)) obj[k][idx] = this.sanitizeQuery(i, schema, k)
+          })
+        } else obj[k] = sanitize(k, v, parent)
+      })
+      return obj
     }
 
     validationErrorMessage = (err) => {