dobo 1.1.17 → 1.1.19

package/bajo/intl/en-US.json

@@ -122,6 +122,7 @@
   "errorAddingFixture%s%s": "Error adding fixture on model '%s': %s",
   "memoryDbSkipped%s": "'%s' is a memory DB, skipped",
   "db": "DB",
+  "invalidQuery": "Invalid Query",
   "field": {
     "id": "ID",
     "code": "Kode",

package/bajo/intl/id.json

@@ -115,6 +115,7 @@
   "recordsAdded%s%d%d": "%s: %d of %d records added",
   "driverInstantiated%s%s": "- Driver '%s:%s' instantiated",
   "db": "DB",
+  "invalidQuery": "Kueri Tidak Valid",
   "field": {
     "id": "ID",
     "code": "Kode",

package/dobo/feature/created-at.js

@@ -8,8 +8,9 @@ async function createdAt (opts = {}) {
     },
     hook: {
       beforeCreate: async function ({ body }) {
+        const { isSet } = this.lib.aneka
         const now = new Date()
-        if (opts.overwrite || !this.app.bajo.isSet(body[opts.fieldName])) body[opts.fieldName] = now
+        if (opts.overwrite || !isSet(body[opts.fieldName])) body[opts.fieldName] = now
       }
     }
   }

package/dobo/feature/updated-at.js

@@ -9,12 +9,14 @@ async function updatedAt (opts = {}) {
     },
     hook: {
       beforeCreate: async function ({ body }) {
+        const { isSet } = this.lib.aneka
         const now = new Date()
-        if (opts.overwrite || !this.app.bajo.isSet(body[opts.fieldName])) body[opts.fieldName] = now
+        if (opts.overwrite || !isSet(body[opts.fieldName])) body[opts.fieldName] = now
       },
       beforeUpdate: async function ({ body }) {
+        const { isSet } = this.lib.aneka
         const now = new Date()
-        if (opts.overwrite || !this.app.bajo.isSet(body[opts.fieldName])) body[opts.fieldName] = now
+        if (opts.overwrite || !isSet(body[opts.fieldName])) body[opts.fieldName] = now
       }
     }
   }

package/lib/check-unique.js

@@ -1,5 +1,5 @@
 async function checkUnique ({ schema, body, id }) {
-  const { isSet } = this.app.bajo
+  const { isSet } = this.lib.aneka
   const { filter, map, set } = this.lib._
   const singles = map(filter(schema.properties, p => (p.index ?? {}).type === 'unique'), 'name')
   const opts = { noHook: true, noCache: true, thrownNotFound: false, forceNoHidden: true }

package/lib/collect-schemas.js

@@ -2,7 +2,8 @@ import path from 'path'
 import sanitizeSchema from './sanitize-schema.js'
 
 async function handler ({ file, alias, ns }) {
-  const { readConfig, pascalCase, eachPlugins } = this.app.bajo
+  const { readConfig, eachPlugins } = this.app.bajo
+  const { pascalCase } = this.lib.aneka
   const { get, isPlainObject, each, find, has, isArray, forOwn, isString, merge } = this.lib._
   const { fastGlob } = this.lib
 

package/lib/multi-rel-rows.js

@@ -1,5 +1,5 @@
 async function multiRelRows ({ schema, records, options = {} }) {
-  const { isSet } = this.app.bajo
+  const { isSet } = this.lib.aneka
   const { uniq, find, map } = this.lib._
   const props = schema.properties.filter(p => isSet(p.rel) && !(options.hidden ?? []).includes(p.name))
   // const props = schema.properties.filter(p => isSet(p.rel))

package/lib/sanitize-schema.js

@@ -37,7 +37,8 @@ async function sanitizeFullText (item) {
 }
 
 async function sanitizeSchema (items) {
-  const { freeze, fatal, importModule, defaultsDeep, join, breakNsPath, runHook } = this.app.bajo
+  const { defaultsDeep } = this.lib.aneka
+  const { freeze, fatal, importModule, join, breakNsPath, runHook } = this.app.bajo
   const { isEmpty, orderBy, map, keys, findIndex, find, each, isString, get, isPlainObject, camelCase, uniq, filter } = this.lib._
   const propTypes = keys(this.propType)
   const schemas = []

package/lib/single-rel-rows.js

@@ -1,5 +1,5 @@
 async function singleRelRows ({ schema, record, options = {} }) {
-  const { isSet } = this.app.bajo
+  const { isSet } = this.lib.aneka
   const { find } = this.lib._
   const props = schema.properties.filter(p => isSet(p.rel) && !(options.hidden ?? []).includes(p.name))
   const rels = {}

package/package.json

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

package/plugin/factory.js

@@ -267,17 +267,22 @@ async function factory (pkgName) {
     buildQuery = async ({ filter, schema, options = {} } = {}) => {
       const { trim, isString, isPlainObject } = this.lib._
       let query = {}
+      if (schema.name === 'SeatrackVessel') this.app.dump(filter)
       if (isString(filter.query)) {
-        filter.oquery = filter.query
-        if (trim(filter.query).startsWith('{')) query = JSON.parse(filter.query)
-        else query = nql(filter.query).parse()
+        try {
+          filter.oquery = filter.query
+          if (trim(filter.query).startsWith('{')) query = JSON.parse(filter.query)
+          else query = nql(filter.query).parse()
+        } catch (err) {
+          this.error('invalidQuery', { orgMessage: err.message })
+        }
       } else if (isPlainObject(filter.query)) query = filter.query
       return this.sanitizeQuery(query, schema)
     }
 
     sanitizeQuery = (query, schema, parent) => {
       const { cloneDeep, isPlainObject, isArray, find } = this.lib._
-      const { isSet } = this.app.bajo
+      const { isSet } = this.lib.aneka
       const { dayjs } = this.lib
       const obj = cloneDeep(query)
       const keys = Object.keys(obj)
@@ -336,8 +341,9 @@ async function factory (pkgName) {
 
     getSchema = (input, cloned = true) => {
       const { find, isPlainObject, cloneDeep } = this.lib._
+      const { pascalCase } = this.lib.aneka
       let name = isPlainObject(input) ? input.name : input
-      name = this.app.bajo.pascalCase(name)
+      name = pascalCase(name)
       const schema = find(this.schemas, { name })
       if (!schema) throw this.error('unknownModelSchema%s', name)
       return cloned ? cloneDeep(schema) : schema

package/plugin/method/attachment/get-path.js

@@ -1,5 +1,6 @@
 async function getPath (name, id, field, file, options = {}) {
-  const { pascalCase, getPluginDataDir } = this.app.bajo
+  const { getPluginDataDir } = this.app.bajo
+  const { pascalCase } = this.lib.aneka
   const { fs } = this.lib
   const dir = `${getPluginDataDir(this.name)}/attachment/${pascalCase(name)}/${id}`
   if (options.dirOnly) return dir

package/plugin/method/attachment/pre-check.js

@@ -1,5 +1,6 @@
 function preCheck (name) {
-  name = this.app.bajo.pascalCase(name)
+  const { pascalCase } = this.lib.aneka
+  name = pascalCase(name)
   const schema = this.getSchema(name)
   if (!schema.attachment) return false
   return name

package/plugin/method/bulk/create.js

@@ -3,7 +3,8 @@ import execValidation from '../../../lib/exec-validation.js'
 import execFeatureHook from '../../../lib/exec-feature-hook.js'
 
 async function create (name, inputs, options) {
-  const { generateId, runHook, isSet } = this.app.bajo
+  const { isSet } = this.lib.aneka
+  const { generateId, runHook } = this.app.bajo
   const { clearModel } = this.cache ?? {}
   const { find } = this.lib._
   options.dataOnly = options.dataOnly ?? true

package/plugin/method/record/create.js

@@ -7,7 +7,8 @@ import execFeatureHook from '../../../lib/exec-feature-hook.js'
 import singleRelRows from '../../../lib/single-rel-rows.js'
 
 async function create (name, input, opts = {}) {
-  const { generateId, runHook, isSet } = this.app.bajo
+  const { generateId, runHook } = this.app.bajo
+  const { isSet } = this.lib.aneka
   const { clearModel } = this.cache ?? {}
   const { find, forOwn, cloneDeep, camelCase, omit, get, pick } = this.lib._
   delete opts.record

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

@@ -3,7 +3,8 @@ import singleRelRows from '../../../lib/single-rel-rows.js'
 import execFeatureHook from '../../../lib/exec-feature-hook.js'
 
 async function findOne (name, filter = {}, opts = {}) {
-  const { runHook, isSet } = this.app.bajo
+  const { isSet } = this.lib.aneka
+  const { runHook } = this.app.bajo
   const { get, set } = this.cache ?? {}
   const { cloneDeep, camelCase, omit } = this.lib._
   delete opts.record

package/plugin/method/record/find.js

@@ -3,7 +3,8 @@ import multiRelRows from '../../../lib/multi-rel-rows.js'
 import execFeatureHook from '../../../lib/exec-feature-hook.js'
 
 async function find (name, filter = {}, opts = {}) {
-  const { runHook, isSet } = this.app.bajo
+  const { isSet } = this.lib.aneka
+  const { runHook } = this.app.bajo
   const { get, set } = this.cache ?? {}
   const { cloneDeep, camelCase, omit } = this.lib._
   delete opts.records

package/plugin/method/record/get.js

@@ -3,7 +3,8 @@ import singleRelRows from '../../../lib/single-rel-rows.js'
 import execFeatureHook from '../../../lib/exec-feature-hook.js'
 
 async function get (name, id, opts = {}) {
-  const { runHook, isSet } = this.app.bajo
+  const { isSet } = this.lib.aneka
+  const { runHook } = this.app.bajo
   const { get, set } = this.cache ?? {}
   const { cloneDeep, camelCase, omit } = this.lib._
   delete opts.record

package/plugin/method/record/update.js

@@ -6,7 +6,8 @@ import execFeatureHook from '../../../lib/exec-feature-hook.js'
 import singleRelRows from '../../../lib/single-rel-rows.js'
 
 async function update (name, id, input, opts = {}) {
-  const { runHook, isSet } = this.app.bajo
+  const { isSet } = this.lib.aneka
+  const { runHook } = this.app.bajo
   const { clearModel } = this.cache ?? {}
   const { forOwn, find, cloneDeep, camelCase, omit, get } = this.lib._
   delete opts.record

package/plugin/method/sanitize/body.js

@@ -1,5 +1,7 @@
 async function sanitizeBody ({ body = {}, schema = {}, partial, strict, extFields = [] }) {
-  const { isSet, dayjs, callHandler } = this.app.bajo
+  const { isSet } = this.lib.aneka
+  const { dayjs } = this.lib
+  const { callHandler } = this.app.bajo
   const { has, isString, isNumber, concat, isNaN } = this.lib._
   const result = {}
   for (const p of concat(schema.properties, extFields)) {

package/plugin/method/validate.js

@@ -126,7 +126,7 @@ function buildFromDbSchema (schema, { fields = [], rule = {}, extFields = [] } =
 }
 
 async function validate (value, joiSchema, { ns, fields, extFields, params } = {}) {
-  const { defaultsDeep, isSet } = this.app.bajo
+  const { defaultsDeep, isSet } = this.lib.aneka
   const { isString, forOwn, find } = this.lib._
 
   ns = ns ?? [this.name]

package/waibuMpa/route/attachment/@model/@id/@field/@file.js

@@ -2,7 +2,7 @@ import path from 'path'
 
 async function attachment (req, reply) {
   const { isString, isEmpty, find } = this.lib._
-  const { pascalCase } = this.app.bajo
+  const { pascalCase } = this.lib.aneka
   const { routePath } = this.app.waibu
   const { fs } = this.lib
   const items = await this.listAttachments({