dobo 1.0.3 → 1.0.5

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

@@ -8,12 +8,13 @@ async function findOne (name, filter = {}, opts = {}) {
   const options = cloneDeep(omit(opts, ['req']))
   options.req = opts.req
   options.dataOnly = options.dataOnly ?? true
-  const { fields, dataOnly, noHook, noCache, hidden, forceNoHidden } = options
+  let { fields, dataOnly, noHook, noCache, hidden, forceNoHidden } = options
   await this.modelExists(name, true)
   filter.limit = 1
   options.count = false
   options.dataOnly = false
   const { handler, schema, driver } = await resolveMethod.call(this, name, 'record-find', options)
+  if (!schema.cacheable) noCache = true
   if (!noHook) {
     await runHook(`${this.name}:beforeRecordFindOne`, name, filter, options)
     await runHook(`${this.name}.${camelCase(name)}:beforeRecordFindOne`, filter, options)

package/bajo/method/record/find.js

@@ -8,11 +8,12 @@ async function find (name, filter = {}, opts = {}) {
   const options = cloneDeep(omit(opts, ['req']))
   options.req = opts.req
   options.dataOnly = options.dataOnly ?? true
-  const { fields, dataOnly, noHook, noCache, hidden, forceNoHidden } = options
+  let { fields, dataOnly, noHook, noCache, hidden, forceNoHidden } = options
   options.count = options.count ?? false
   options.dataOnly = false
   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 }) ?? {}
   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 }) ?? {}

package/bajo/method/record/get.js

@@ -8,9 +8,10 @@ async function get (name, id, opts = {}) {
   const options = cloneDeep(omit(opts, ['req']))
   options.req = opts.req
   options.dataOnly = options.dataOnly ?? true
-  const { fields, dataOnly, noHook, noCache, hidden = [], forceNoHidden } = options
+  let { fields, dataOnly, noHook, noCache, hidden = [], forceNoHidden } = options
   await this.modelExists(name, true)
   const { handler, schema, driver } = await resolveMethod.call(this, name, 'record-get', options)
+  if (!schema.cacheable) noCache = true
   id = this.sanitizeId(id, schema)
   options.dataOnly = false
   if (!noHook) {

package/lib/add-fixtures.js

@@ -41,6 +41,7 @@ async function addFixture (name, { spinner } = {}) {
       result.success++
       if (spinner) spinner.setText('%s: %d of %d records added', schema.name, result.success, items.length)
     } catch (err) {
+      console.log(err)
       err.model = schema.name
       if (this.app.bajo.applet) this.print.fail(this.validationErrorMessage(err))
       // else this.log.error('Add fixture \'%s@%s\' error: %s', schema.name, schema.connection, err.message)

package/lib/collect-schemas.js

@@ -32,9 +32,8 @@ async function handler ({ file, alias, ns }) {
   mod.feature = feats
   if ((mod.properties ?? []).length === 0) this.fatal('Schema \'%s\' doesn\'t have properties at all', mod.name)
   // schema extender
-  const me = this
   await eachPlugins(async function (opts) {
-    const glob = `${opts.dir}/${me.name}/extend/schema/${mod.name}.*`
+    const glob = `${opts.dir}/dobo/extend/schema/${mod.name}.*`
     const files = await fastGlob(glob)
     for (const file of files) {
       const extender = await readConfig(file, { ns: opts.ns, ignoreError: true })

package/lib/sanitize-schema.js

@@ -44,6 +44,7 @@ async function sanitizeSchema (items) {
     this.log.trace('- %s (%d)', k, keys(items[k]).length)
     for (const f in items[k]) {
       const item = items[k][f]
+      item.cacheable = item.cacheable ?? true
       await runHook(`dobo.${camelCase(item.name)}:beforeSanitizeSchema`, item)
       const conn = find(this.connections, { name: item.connection })
       if (!conn) fatal.call(this, 'Unknown connection \'%s@%s\'', item.name, item.connection)

package/package.json

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