sumba 2.19.4 → 2.21.0

package/extend/sumba/route-guard/anonymous.json

@@ -0,0 +1,10 @@
+[{
+  "path": "sumba:/user/**/*",
+  "methods": ["*"]
+}, {
+  "path": "sumba:/signin",
+  "methods": ["*"]
+}, {
+  "path": "sumba.restapi:/user/access-token/**/*",
+  "methods": ["*"]
+}]

package/extend/sumba/route-guard/secure.json

@@ -0,0 +1,8 @@
+[
+  "sumba:/your-stuff/**/*",
+  "sumba:/signout",
+  "sumba:/help/trouble-tickets/**/*",
+  "sumba.restapi:/user/api-key",
+  "sumba.restapi:/your-stuff/**/*",
+  "sumba.restapi:/manage/**/*"
+]

package/extend/waibuDb/schema/team-setting.js

@@ -8,11 +8,6 @@ async function teamUser () {
       calcFields: [
         { name: 'team', type: 'string' }
       ],
-      formatValue: {
-        team: (val, rec) => {
-          return rec._ref.team.name
-        }
-      },
       widget: {
         teamId: {
           component: 'form-select-ext',

package/extend/waibuDb/schema/user-setting.js

@@ -5,14 +5,6 @@ async function teamUser ({ req } = {}) {
         { name: 'meta', fields: ['id', 'userId', 'createdAt', 'updatedAt'] },
         { name: 'general', fields: ['ns', 'key', 'value'] }
       ],
-      calcFields: [
-        { name: 'user', type: 'string' }
-      ],
-      formatValue: {
-        user: (val, rec) => {
-          return rec._ref.user.name
-        }
-      },
       widget: {
         userId: {
           component: 'form-select-ext',

package/extend/waibuDb/schema/user.js

@@ -7,12 +7,6 @@ async function user ({ req } = {}) {
         { name: 'address', fields: ['address1:12', 'address2:12', 'city:6-md 8-sm', 'zipCode:2-md 4-sm', 'provinceState:4-md', 'country:6-md', 'phone:6-md', 'website:12'] },
         { name: 'socialMedia', fields: ['socX:3-md 6-sm', 'socInstagram:3-md 6-sm', 'socFacebook:3-md 6-sm', 'socLinkedIn:3-md 6-sm'] }
       ],
-      formatValue: {
-        token: async function (val, rec) {
-          const { hash } = this.app.bajoExtra
-          return await hash(rec.salt)
-        }
-      },
       widget: {
         token: {
           component: 'form-plaintext'

package/extend/waibuMpa/extend/waibuAdmin/route/site.js

@@ -13,8 +13,7 @@ const manageSite = {
     req.params.base = ''
     const options = {
       modelOpts: {
-        formatValue: true,
-        retainOriginalValue: true,
+        fmt: true,
         noCache: true
       },
       schema: {

package/extend/waibuMpa/route/your-stuff/profile/edit.js

@@ -10,7 +10,7 @@ const profile = {
     const { omit, pick } = this.app.lib._
     const { hash } = this.app.bajoExtra
 
-    const options = { forceNoHidden: ['token'], noHook: true, noCache: true, formatValue: true, retainOriginalValue: true }
+    const options = { forceNoHidden: ['token'], noHook: true, noCache: true, fmt: true }
     const mdl = this.app.dobo.getModel(model)
 
     const { schema } = await getSchemaExt(model, 'edit', { ...options, args: [{ req, model: mdl }] })

package/extend/waibuMpa/route/your-stuff/profile.js

@@ -3,7 +3,7 @@ const profile = {
   handler: async function (req, reply) {
     const { hash } = this.app.bajoExtra
     const { getRecord } = this.app.waibuDb
-    const options = { forceNoHidden: ['token'], noHook: true, noCache: true, attachment: true, mimeType: true, formatValue: true, retainOriginalValue: true }
+    const options = { forceNoHidden: ['token'], noHook: true, noCache: true, attachment: true, mimeType: true, fmt: true }
     const resp = await getRecord({ model: 'SumbaUser', req, id: req.user.id, options })
     const form = resp.data
     form.token = await hash(form.salt)

package/index.js

@@ -537,6 +537,26 @@ async function factory (pkgName) {
       return password
     }
 
+    parseRouteGuard = item => {
+      const { routePath, routePathHandlers } = this.app.waibu
+      const { isString, isEmpty } = this.app.lib._
+      if (isString(item)) {
+        let [path, methods] = item.split('|').map(i => i.trim())
+        methods = isEmpty(methods) ? ['*'] : methods.split(',').map(i => i.trim())
+        item = { path, methods }
+      }
+      item.methods = item.methods ?? ['*']
+      if (item.methods.includes('*')) item.methods = ['*']
+      const [, routeHandler] = item.path.split(':')[0].split('.')
+      if (!isEmpty(routeHandler) && !routePathHandlers[routeHandler]) return
+      const rns = isEmpty(routeHandler) ? 'waibuMpa' : routePathHandlers[routeHandler].ns
+      if (!this.app[rns]) return
+      item.inverse = item.path[0] === '!'
+      if (item.inverse) item.path = item.path.slice(1)
+      item.path = routePath(item.path, { defFormat: false })
+      return item
+    }
+
     createNewSite = createNewSite
     removeSite = removeSite
     getSite = getSite

package/lib/collect.js

@@ -1,22 +1,15 @@
 export async function collect ({ type = '', handler, container, file, ns, dir }) {
   const { readConfig } = this.app.bajo
-  const { routePath, routePathHandlers } = this.app.waibu
-  const { camelCase, find, isString, isEmpty } = this.app.lib._
-  let items = await readConfig(file, { ignoreError: true })
+  const { parseRouteGuard } = this
+  const { camelCase, find, isEmpty } = this.app.lib._
+  let items = await readConfig(file, { ns, baseNs: this.ns, defValue: [] })
   if (isEmpty(items)) items = []
   for (let item of items) {
-    if (isString(item)) item = { path: item }
-    const routeHandler = item.routeHandler
-    delete item.routeHandler
-    if (!isEmpty(routeHandler) && !routePathHandlers[routeHandler]) continue
-    const rns = routeHandler ? routePathHandlers[routeHandler].ns : 'waibuMpa'
-    if (!this.app[rns]) continue
-    const isNeg = item.path[0] === '!'
-    if (isNeg) item.path = item.path.slice(1)
-    item.path = routePath(`${ns}${routeHandler ? ('.' + routeHandler) : ''}:${item.path}`, { defFormat: false })
-    item.methods = item.methods ?? ['*']
+    item = parseRouteGuard(item)
+    if (!item) continue
     if (handler) await handler.call(this, item)
-    const guards = this[camelCase(`${type} ${isNeg ? 'Neg' : ''} ${container}`)]
+    const guards = this[camelCase(`${type} ${item.reverse ? 'Neg' : ''} ${container}`)]
+    delete item.reverse
     if (find(guards, { path: item.path })) continue
     guards.push(item)
   }
@@ -41,7 +34,7 @@ export async function collectRoutes (type) {
   await eachPlugins(async function ({ file, dir }) {
     const { ns } = this
     await collect.call(me, { type, container: 'Routes', handler, file, ns, dir })
-  }, { glob: `route/${type}.*`, prefix: this.ns })
+  }, { glob: `route-guard/${type}.*`, prefix: this.ns })
 }
 
 export async function collectTeam () {

package/lib/create-new-site.js

@@ -32,7 +32,7 @@ export async function getAllFixtures (alias) {
     const file = `${overrideBase}/${kebabCase(m)}`
     let fixtures = (await model.loadFixtures({ collectItems: true, noLookup: true })) ?? []
     if (files.includes(file)) {
-      const items = await readConfig(file, { ignoreError: true, defValue: [] })
+      const items = await readConfig(file, { defValue: [] })
       if (!isEmpty(items)) fixtures = items
     }
     if (!Array.isArray(fixtures)) fixtures = [fixtures]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "2.19.4",
+  "version": "2.21.0",
   "description": "Biz Suite for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,19 @@
 # Changes
 
+## 2026-04-25
+
+- [2.21.0] Change options to format value using the new key set by dobo
+- [2.21.0] Remove ```options.retainOriginalValue``` since it is not needed anymore
+- [2.21.0] Remove ```property.formatValue``` from all properties
+- [2.21.0] Remove ```schema.formatValue``` from all schemas
+- [2.21.0] Remove ```schema.calcFields``` from all schemas
+
+## 2026-04-23
+
+- [2.20.0] Add ```parseRouteGuard()```
+- [2.20.0] Change endpoint ```sumba/route``` to ```sumba/route-guard```
+- [2.20.0] Deep merging of route guards
+
 ## 2026-04-21
 
 - [2.19.4] Bug fix in ```getCountriesValues()```

package/extend/sumba/route/anonymous.json

@@ -1,11 +0,0 @@
-[{
-  "path": "/user/**/*",
-  "methods": ["*"]
-}, {
-  "path": "/signin",
-  "methods": ["*"]
-}, {
-  "path": "/user/access-token/**/*",
-  "routeHandler": "restapi",
-  "methods": ["*"]
-}]

package/extend/sumba/route/secure.json

@@ -1,14 +0,0 @@
-[
-  "/your-stuff/**/*",
-  "/signout",
-  "/help/trouble-tickets/**/*",
-{
-  "path": "/user/api-key",
-  "routeHandler": "restapi"
-}, {
-  "path": "/your-stuff/**/*",
-  "routeHandler": "restapi"
-}, {
-  "path": "/manage/**/*",
-  "routeHandler": "restapi"
-}]