waibu-mpa 2.17.1 → 2.18.0

package/lib/build-routes.js

@@ -3,7 +3,7 @@ import path from 'path'
 export async function build ({ files, pathPrefix, dir, ns, cfg, parent, urlPrefix, subRoute }) {
   const { defaultsDeep, parseObject } = this.app.lib.aneka
   const { importModule, readJson } = this.app.bajo
-  const { isFunction, isPlainObject, pick, last, camelCase, omit } = this.app.lib._
+  const { isFunction, isPlainObject, pick, last, camelCase, omit, trimEnd } = this.app.lib._
   const { titleize } = this.app.lib.aneka
   const { getPluginPrefix } = this.app.waibu
   const mergeRouteHooks = await importModule('waibu:/lib/webapp-scope/merge-route-hooks.js')
@@ -11,7 +11,9 @@ export async function build ({ files, pathPrefix, dir, ns, cfg, parent, urlPrefi
   const me = this
   for (const f of files) {
     const ext = path.extname(f)
-    const url = f.slice(0, f.length - ext.length).replace(`${dir}/extend/${pathPrefix}`, '').replaceAll('@', ':')
+    const urls = f.slice(0, f.length - ext.length).replace(`${dir}/extend/${pathPrefix}`, '').replaceAll('@', ':').split('/')
+    if (last(urls) === 'index') urls.pop()
+    const url = urls.join('/')
     let mod
     if (ext === '.js') mod = await importModule(f)
     else if (ext === '.json') mod = await readJson(f)
@@ -21,11 +23,10 @@ export async function build ({ files, pathPrefix, dir, ns, cfg, parent, urlPrefi
     else if (isPlainObject(mod)) mod = [mod]
     for (let m of mod) {
       const mhandler = m.handler // parseObject has problem with function
-      const murl = m.url
+      const murl = m.url // same as above
       m = parseObject(omit(m, ['handler', 'url'], { parseValue: true }))
-      m.handler = mhandler
       m.url = murl
-
+      m.handler = mhandler
       m.url = m.url ?? url
       if (isFunction(m.url)) m.url = await m.url.call(this)
       if (m.redirect) {
@@ -45,6 +46,7 @@ export async function build ({ files, pathPrefix, dir, ns, cfg, parent, urlPrefi
         }
       }
       if (urlPrefix) m.url = `/${urlPrefix}/${m.url}`
+      m.url = trimEnd(m.url, '/')
       m.method = m.method ?? 'GET'
       await mergeRouteHooks.call(me, m)
       m.config = m.config ?? {}

package/lib/class/widget.js

@@ -26,6 +26,7 @@ async function widgetFactory () {
       this.formData = get(this, `component.locals.${this.params.attr.keyLocals ?? 'form'}`, {})
       this.oldData = get(this, `component.locals.${this.params.attr.keyOldData ?? 'oldData'}`, {})
       this.schema = get(this, `component.locals.${this.params.attr.keySchema ?? 'schema'}`, {})
+      if (this.schema.name) this.model = this.app.dobo.getModel(this.schema.name)
     }
 
     _parseBase64Attr = (text, defValue = {}) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-mpa",
-  "version": "2.17.1",
+  "version": "2.18.0",
   "description": "MPA support for Waibu Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-06-03
+
+- [2.18.0] Populate ```widget.model``` if available
+- [2.18.0] If route's url ends with ```index```, rewrite url to use it's folder instead
+
 ## 2026-06-01
 
 - [2.17.1] Bug fix in ```component.buildTag()```