waibu-mpa 2.16.0 → 2.17.1

package/extend/bajo/hook.js

@@ -0,0 +1,41 @@
+async function checkLang (req, reply) {
+  if (!req.session) return
+  if (req.langDetector) {
+    req.session.lang = req.lang
+    return
+  }
+  if (req.session.lang) req.lang = req.session.lang
+}
+
+async function checkDark (req, reply) {
+  const { isSet } = this.app.lib.aneka
+  const key = this.config.darkMode.qsKey
+  const value = this.config.darkMode.set ?? req.query[key]
+  if (isSet(value)) {
+    req.darkMode = value
+    if (req.session) req.session.darkMode = req.darkMode
+    return
+  }
+  if (isSet(req.session.darkMode)) req.darkMode = req.session.darkMode
+}
+
+async function hook () {
+  return [{
+    level: 9,
+    name: 'waibuMpa:preParsing',
+    handler: async function (req, reply) {
+      const { importModule } = this.app.bajo
+      const attachIntl = await importModule('waibu:/lib/webapp-scope/attach-intl.js')
+      await attachIntl.call(this, this.config.intl.detectors, req, reply)
+      await checkLang.call(this, req, reply)
+      await checkDark.call(this, req, reply)
+    }
+  }, {
+    name: 'waibuMpa.theme:afterInjectScripts',
+    handler: async function ({ items }) {
+      // items.push(`${this.ns}.virtual:/json2csv/json2csv.js`)
+    }
+  }]
+}
+
+export default hook

package/extend/waibuMpa/route/component/render.js

@@ -2,8 +2,6 @@ const component = {
   method: 'POST',
   noCacheReq: true,
   handler: async function (req, reply) {
-    const { getPluginDataDir } = this.app.bajo
-    const { fs } = this.app.lib
     const { merge, get } = this.app.lib._
     req.referer = req.headers['x-referer']
     const pageId = req.headers['x-req-id']
@@ -13,9 +11,8 @@ const component = {
     reply.header('Content-Language', req.lang)
     if (pageId) {
       try {
-        const file = `${getPluginDataDir(this.ns)}/cache/req/${pageId}/locals.json`
-        const locals = JSON.parse(fs.readFileSync(file, 'utf8'))
-        params = merge({}, locals, params)
+        const locals = await this.app.cache.load(`${this.ns}.req:/${pageId}-locals.json`, this.config.reqTtlDur)
+        params = merge({}, locals ?? {}, params)
       } catch (err) {}
     }
     const theme = get(req, 'headers.x-theme', get(params, '_meta.theme.name'))

package/index.js

@@ -138,10 +138,7 @@ async function factory (pkgName) {
         compress: false,
         rateLimit: false,
         disabled: [],
-        purgeCache: {
-          intvDur: '1m',
-          reqTtlDur: '1d'
-        }
+        reqTtlDur: '1d'
       }
 
       this.configDev = {
@@ -171,13 +168,6 @@ async function factory (pkgName) {
       await widgetFactory.call(this)
     }
 
-    start = async () => {
-      this.purgeCache()
-      setInterval(() => {
-        this.purgeCache()
-      }, this.config.purgeCache.intvDur)
-    }
-
     buildUrl = ({ exclude = [], prefix = '?', base, url = '', params = {}, prettyUrl }) => {
       const { parseObject } = this.app.lib
       const { qs } = this.app.waibu
@@ -640,18 +630,6 @@ async function factory (pkgName) {
       if (!iconset) return iconset
       return nameOnly ? iconset.name : iconset
     }
-
-    purgeCache = async () => {
-      const { getPluginDataDir } = this.app.bajo
-      const { fastGlob, fs } = this.app.lib
-      const dirs = await fastGlob(`${getPluginDataDir(this.ns)}/cache/req/*`, { onlyDirectories: true })
-      for (const dir of dirs) {
-        try {
-          const { mtimeMs } = await fs.stat(dir)
-          if (Date.now() - mtimeMs > this.config.purgeCache.reqTtlDur) await fs.remove(dir)
-        } catch (err) {}
-      }
-    }
   }
 
   return WaibuMpa

package/lib/build-page/inject-elements.js

@@ -38,7 +38,7 @@ async function injectElements (options) {
   }
   options.inlineScript = rsc.inlineScript
   options.inlineCss = rsc.inlineCss
-  await runHook(`${this.ns}:beforeBuildPageInjectElement`, options)
+  await runHook(`${this.ns}.injectElement:beforeBuildPage`, options)
   await injectMeta.call(this, options)
   await injectLink.call(this, options)
   await injectCss.call(this, options)

package/lib/build-page.js

@@ -33,7 +33,7 @@ async function buildPage ({ text, locals = {}, opts = {} } = {}) {
   const ns = req.ns
   let $ = cheerio.load(text, this.config.cheerio.loadOptions, false)
   if (partial) $('c\\:page-start, c\\:page-end').remove()
-  await runHook(`${this.ns}:beforeBuildPage${partial ? 'Partial' : ''}`, { $, theme, iconset, req, reply, locals, ns, text })
+  await runHook(`${this.ns}${partial ? '.partial' : ''}:beforeBuildPage`, { $, theme, iconset, req, reply, locals, ns, text })
   await attrsMutation.call(this, { $, el: $.root(), req })
   const cmp = await theme.createComponent({ $, iconset, req, reply, locals: cloneDeep(locals), scriptBlock: reqAsset[req.id].scriptBlock, styleBlock: reqAsset[req.id].styleBlock })
   await replaceTag.call(this, { el: $.root(), cmp, opts })

package/lib/class/component.js

@@ -115,12 +115,12 @@ async function componentFactory () {
       params.attr.class = without(uniq(params.attr.class), undefined, null, '')
       if (isEmpty(params.attr.class)) delete params.attr.class
       if (isEmpty(params.attr.style)) delete params.attr.style
-      if (isEmpty(params.html)) return await this.render(params)
+      if (isEmpty(params.html)) return await this.render(params, opts)
 
       const merged = merge({}, params.locals, { attr: params.attr })
       const result = await compile(params.html, merged, { ttl: this.ttlDur })
       params.html = result
-      return await this.render(params)
+      return await this.render(params, opts)
     }
 
     /**

package/lib/decorate.js

@@ -19,12 +19,12 @@ async function isCacheable (req, cachedUrls) {
 }
 
 async function decorate () {
-  const { importModule, getPluginDataDir } = this.app.bajo
+  const { importModule } = this.app.bajo
   const buildLocals = await importModule('waibu:/lib/build-locals.js')
   const { importPkg } = this.app.bajo
   const { isString, cloneDeep, isEmpty, get } = this.app.lib._
   const { get: getCache, set: setCache } = this.app.bajoCache ?? {}
-  const { outmatch, fs } = this.app.lib
+  const { outmatch } = this.app.lib
   const { routePath } = this.app.waibu
   const mime = await importPkg('waibu:mime')
   const cfg = this.config
@@ -65,9 +65,7 @@ async function decorate () {
     }
     const locals = await buildLocals.call(me, { tpl, params, opts })
     if (!get(this.request, 'routeOptions.config.noCacheReq')) {
-      const dir = `${getPluginDataDir(me.ns)}/cache/req/${opts.req.id}`
-      fs.ensureDirSync(dir)
-      fs.writeFileSync(`${dir}/locals.json`, JSON.stringify(locals, null, 2), 'utf8')
+      await me.app.cache.save(`${me.ns}.req:/${opts.req.id}-locals.json`, locals, me.config.reqTtlDur)
     }
     const result = await me.render(tpl, locals, opts)
     if (ttl > 0) await setCache({ key, value: result, ttl })

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-06-01
+
+- [2.17.1] Bug fix in ```component.buildTag()```
+
+## 2026-05-28
+
+- [2.17.0] Change hooks to be written in one ```hook.js``` file
+- [2.17.0] Change model schemas to be written in one ```model.js``` file
+
 ## 2026-05-25
 
 - [2.16.0] Add theme & iconset auto detection mechanism

package/extend/bajo/hook/waibu-mpa.theme@after-inject-scripts.js

@@ -1,5 +0,0 @@
-async function waibuMpaThemeAfterInjectScripts ({ items }) {
-  // items.push(`${this.ns}.virtual:/json2csv/json2csv.js`)
-}
-
-export default waibuMpaThemeAfterInjectScripts

package/extend/bajo/hook/waibu-mpa@pre-parsing.js

@@ -1,33 +0,0 @@
-async function checkLang (req, reply) {
-  if (!req.session) return
-  if (req.langDetector) {
-    req.session.lang = req.lang
-    return
-  }
-  if (req.session.lang) req.lang = req.session.lang
-}
-
-async function checkDark (req, reply) {
-  const { isSet } = this.app.lib.aneka
-  const key = this.config.darkMode.qsKey
-  const value = this.config.darkMode.set ?? req.query[key]
-  if (isSet(value)) {
-    req.darkMode = value
-    if (req.session) req.session.darkMode = req.darkMode
-    return
-  }
-  if (isSet(req.session.darkMode)) req.darkMode = req.session.darkMode
-}
-
-const waibuMpaPreParsing = {
-  level: 9,
-  handler: async function (req, reply) {
-    const { importModule } = this.app.bajo
-    const attachIntl = await importModule('waibu:/lib/webapp-scope/attach-intl.js')
-    await attachIntl.call(this, this.config.intl.detectors, req, reply)
-    await checkLang.call(this, req, reply)
-    await checkDark.call(this, req, reply)
-  }
-}
-
-export default waibuMpaPreParsing