sumba 0.3.3 → 0.3.5

package/bajo/hook/bajoDb@on-before-record-create.js

@@ -1,12 +1,12 @@
 const bajoDbOnBeforeRecordCreate = {
   level: 1000,
   handler: async function (coll, body, options) {
-    const { importPkg } = this.bajo.helper
     const { get } = this.bajo.helper._
     const { hasColumn } = this.sumba.helper
-    const item = { siteId: 'req.site.id', userId: 'req.user.id' }
+    if (options.noAutoFilter) return
+    const item = { siteId: 'site.id', userId: 'user.id' }
     for (const i in item) {
-      const rec = get(options, item[i])
+      const rec = get(options.req, item[i])
       if (rec && await hasColumn(i, coll)) body[i] = rec
     }
   }

package/bajo/hook/bajoDb@on-before-record-find-one.js

@@ -0,0 +1,8 @@
+import { handler } from './bajoDb@on-before-record-find.js'
+
+const bajoDbOnBeforeRecordFindOne = {
+  level: 1000,
+  handler
+}
+
+export default bajoDbOnBeforeRecordFindOne

package/bajo/hook/bajoDb@on-before-record-find.js

@@ -1,23 +1,26 @@
-const bajoDbOnBeforeRecordFind = {
-  level: 1000,
-  handler: async function (coll, filter, options) {
-    const { isSet } = this.bajo.helper
-    const { isEmpty, cloneDeep, get, set } = this.bajo.helper._
-    const { hasColumn } = this.sumba.helper
-    const item = { siteId: 'req.site.id', userId: 'req.user.id' }
-    for (const i in item) {
-      const rec = get(options, item[i])
-      if (isSet(rec) && await hasColumn(i, coll)) {
-        filter.query = filter.query ?? {}
-        const old = cloneDeep(filter.query.$or)
-        if (old) {
-          filter.query = { $and: [old] }
-          filter.query.$and.push(set({}, i, rec))
-        } else filter.query[i] = rec
-        if (isEmpty(filter.query)) filter.query = undefined
-      }
+export async function handler (coll, filter, options) {
+  const { isSet } = this.bajo.helper
+  const { isEmpty, cloneDeep, get, set } = this.bajo.helper._
+  const { hasColumn } = this.sumba.helper
+  if (options.noAutoFilter) return
+  const item = { siteId: 'site.id', userId: 'user.id' }
+  for (const i in item) {
+    const rec = get(options.req, item[i])
+    if (isSet(rec) && await hasColumn(i, coll)) {
+      filter.query = filter.query ?? {}
+      const old = cloneDeep(filter.query.$or)
+      if (old) {
+        filter.query = { $and: [old] }
+        filter.query.$and.push(set({}, i, rec))
+      } else filter.query[i] = rec
+      if (isEmpty(filter.query)) filter.query = undefined
     }
   }
 }
 
+const bajoDbOnBeforeRecordFind = {
+  level: 1000,
+  handler
+}
+
 export default bajoDbOnBeforeRecordFind

package/bajo/hook/bajoDb@on-before-record-get.js

@@ -1,11 +1,12 @@
-export async function checker (coll, id, req) {
+export async function checker (coll, id, options) {
   const { error } = this.bajo.helper
   const { recordFind } = this.bajoDb.helper
   const { get } = this.bajo.helper._
   const { hasColumn } = this.sumba.helper
+  if (options.noAutoFilter) return
   const item = { siteId: 'site.id', userId: 'user.id' }
   for (const i in item) {
-    const rec = get(req, item[i])
+    const rec = get(options.req, item[i])
     if (rec && await hasColumn(i, coll)) {
       const filter = { query: { id }, limit: 1 }
       filter.query[i] = rec
@@ -18,7 +19,7 @@ export async function checker (coll, id, req) {
 const bajoDbOnBeforeRecordGet = {
   level: 1000,
   handler: async function (coll, id, options) {
-    await checker.call(this, coll, id, options.req)
+    await checker.call(this, coll, id, options)
   }
 }
 

package/bajo/hook/bajoDb@on-before-record-update.js

@@ -3,7 +3,7 @@ import { checker } from './bajoDb@on-before-record-get.js'
 const bajoDbOnBeforeRecordUpdate = {
   level: 1000,
   handler: async function (coll, id, body, options) {
-    await checker.call(this, coll, id, options.req)
+    await checker.call(this, coll, id, options)
   }
 }
 

package/bajo/init.js

@@ -0,0 +1,11 @@
+async function init () {
+  /*
+  const { eachPlugins } = this.bajo.helper
+  const pattern = 'auto-detect.*'
+  await eachPlugins(async function ({ file, plugin, alias }) {
+    console.log(file, plugin, alias)
+  }, pattern)
+  */
+}
+
+export default init

package/bajoAdmin/coll/user.json

@@ -51,6 +51,7 @@
       }]
     },
     "edit": {
+      "shown": ["password"],
       "layouts": [{
         "title": "Meta Info",
         "fields": [
@@ -65,6 +66,7 @@
         "fields": [
           "username;small:6,medium:6",
           "email;small:6,medium:6",
+          "password;small:12,medium:12",
           "firstName;small:6,medium:6",
           "lastName;small:6,medium:6"
         ]

package/lib/check-user-id.js

@@ -1,7 +1,6 @@
 async function checker (req, container) {
-  const { importPkg, getConfig } = this.bajo.helper
+  const { getConfig, outmatch } = this.bajo.helper
   const { get } = this.bajo.helper._
-  const outmatch = await importPkg('outmatch')
   let match
   for (const item of container) {
     let path = item.path

package/lib/collect-routes.js

@@ -2,7 +2,7 @@ const indexes = []
 const invIndexes = []
 
 async function collect (type, { file, plugin, dir }) {
-  const { readConfig, importPkg } = this.bajo.helper
+  const { readConfig } = this.bajo.helper
   const { routeDir } = this.bajoWeb.helper
   const { trim } = this.bajo.helper._
   const { hash } = this.bajoExtra.helper

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Bajo Framework's Biz Suite",
   "main": "index.js",
   "scripts": {