waibu-mpa 1.2.16 → 2.0.0

package/{waibu → extend/waibu}/boot.js

@@ -1,12 +1,12 @@
-import decorate from '../lib/decorate.js'
-import buildRoutes from '../lib/build-routes.js'
-import collectViewEngines from '../lib/collect-view-engines.js'
-import collectThemes from '../lib/collect-themes.js'
-import collectIconsets from '../lib/collect-iconsets.js'
-import handleSession from '../lib/session/setup.js'
-import subApp from '../lib/sub-app.js'
-import notFound from '../lib/not-found.js'
-import error from '../lib/error.js'
+import decorate from '../../lib/decorate.js'
+import buildRoutes from '../../lib/build-routes.js'
+import collectViewEngines from '../../lib/collect-view-engines.js'
+import collectThemes from '../../lib/collect-themes.js'
+import collectIconsets from '../../lib/collect-iconsets.js'
+import handleSession from '../../lib/session/setup.js'
+import subApp from '../../lib/sub-app.js'
+import notFound from '../../lib/not-found.js'
+import error from '../../lib/error.js'
 
 const boot = {
   level: 10,

package/{waibuMpa → extend/waibuMpa}/route/wmpa.js

@@ -5,7 +5,7 @@ const wmpa = {
     const { get, trim } = this.lib._
     const { getPluginPrefix } = this.app.waibu
     const { importModule } = this.app.bajo
-    const { types: formatTypes, formats } = await importModule('bajo:/boot/lib/formats.js', { asDefaultImport: false })
+    const { types: formatTypes, formats } = await importModule('bajo:/lib/formats.js', { asDefaultImport: false })
     const prefix = {
       virtual: `/${getPluginPrefix('waibuStatic')}/${this.app.waibu.config.prefixVirtual}`,
       asset: `/${getPluginPrefix('waibuStatic')}`,

package/index.js

@@ -5,7 +5,7 @@ import minifier from 'html-minifier-terser'
 async function factory (pkgName) {
   const me = this
 
-  return class WaibuMpa extends this.lib.BajoPlugin {
+  return class WaibuMpa extends this.lib.Plugin {
     constructor () {
       super(pkgName, me.app)
       this.alias = 'wmpa'
@@ -193,7 +193,7 @@ async function factory (pkgName) {
       const subNses = ['layout', 'template', 'partial']
       const { ns, path, subNs, subSubNs, qs } = this.app.bajo.breakNsPath(name)
       const plugin = this.app.bajo.getPlugin(ns)
-      const dir = `${plugin.dir.pkg}/waibuMpa`
+      const dir = `${plugin.dir.pkg}/extend/waibuMpa`
       if (!subNses.includes(subNs)) throw this.error('unknownResource%s', name)
       const fullPath = subSubNs ? `${dir}/${subSubNs}/${subNs}${path}` : `${dir}/${subNs}${path}`
       return { ns, subNs, subSubNs, path, qs, fullPath }

package/lib/build-routes.js

@@ -11,7 +11,7 @@ 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}/${pathPrefix}`, '').replaceAll('@', ':')
+    const url = f.slice(0, f.length - ext.length).replace(`${dir}/extend/${pathPrefix}`, '').replaceAll('@', ':')
     let mod
     if (ext === '.js') mod = await importModule(f)
     else if (ext === '.json') mod = await readJson(f)
@@ -88,16 +88,17 @@ async function buildRoutes (ctx, prefix) {
   const appCtxs = {}
   let subRoutes = []
   await runHook(`${this.name}:beforeBuildRoutes`, ctx)
-  await eachPlugins(async function ({ dir, alias, ns }) {
+  await eachPlugins(async function ({ dir }) {
+    const { name: ns } = this
     let appPrefix = getPluginPrefix(ns)
     if (ns === me.ns || (ns === me.app.bajo.mainNs && cfg.mountMainAsRoot)) appPrefix = ''
-    const pattern = `${dir}/${pathPrefix}/**/*.{js,json,html,md}`
+    const pattern = `${dir}/extend/${pathPrefix}/**/*.{js,json,html,md}`
     const files = await fastGlob(pattern)
     // subRoutes
-    const spattern = `${dir}/waibuMpa/extend/{${me.app.bajo.pluginNames.join(',')}}/route/**/*.{js,json,html,md}`
+    const spattern = `${dir}/extend/waibuMpa/extend/{${me.app.bajo.pluginNames.join(',')}}/route/**/*.{js,json,html,md}`
     const sfiles = await fastGlob(spattern)
     for (const file of sfiles) {
-      const [sns] = file.replace(`${dir}/waibuMpa/extend/`, '').split('/')
+      const [sns] = file.replace(`${dir}/extend/waibuMpa/extend/`, '').split('/')
       subRoutes.push({ file, ns: sns, sns: ns, dir })
     }
     if (files.length === 0) return undefined

package/lib/collect-iconsets.js

@@ -13,7 +13,8 @@ async function collectIconsets (ctx) {
   this.log.debug('collect%s', this.log.write('iconsets'))
   const me = this
   const all = []
-  await eachPlugins(async function ({ file, ns }) {
+  await eachPlugins(async function ({ file }) {
+    const { name: ns } = this
     let mod = await importModule(file)
     if (isFunction(mod)) mod = await mod.call(this, ctx)
     if (!isArray(mod)) mod = [mod]

package/lib/collect-themes.js

@@ -19,7 +19,7 @@ async function loadItems (type, theme) {
 
   const container = {}
   // main
-  const files = await fastGlob(`${this.dir.pkg}/waibuMpa/theme/component/${type}/*.js`)
+  const files = await fastGlob(`${this.dir.pkg}/extend/waibuMpa/theme/component/${type}/*.js`)
   for (const file of files) {
     await addItem.call(this, { file, container })
   }

package/lib/collect-view-engines.js

@@ -6,7 +6,8 @@ async function collectViewEngines (ctx) {
   this.viewEngines = []
   this.log.debug('collect%s', 'view engines')
   const me = this
-  await eachPlugins(async function ({ file, ns }) {
+  await eachPlugins(async function ({ file }) {
+    const { name: ns } = this
     let mod = await importModule(file)
     if (isFunction(mod)) mod = await mod.call(this, ctx)
     if (!isArray(mod)) mod = [mod]

package/lib/error.js

@@ -25,7 +25,7 @@ const extHandler = async function (err, req, reply) {
   } catch (err) {
     // only getting here when there is error on view rendering
     console.error(err)
-    const file = getPluginFile(`${this.name}:/bajoTemplate/template/_500.html`)
+    const file = getPluginFile(`${this.name}:/extend/bajoTemplate/template/_500.html`)
     const content = fs.readFileSync(file)
     const compiled = template(content)
     result = compiled({ error: err })

package/lib/load-resource.js

@@ -9,7 +9,9 @@ async function loadResource (mod = [], item) {
   for (const i in mod[item]) {
     if (mod[item][i].startsWith('/')) items.push(mod.css[i])
     else {
-      const { ns, path, subNs } = breakNsPath(mod[item][i], undefined, false)
+      let name = mod[item][i]
+      if (['$', '^'].includes(name[0])) name = name.slice(1)
+      const { ns, path, subNs } = breakNsPath(name, undefined, false)
       if (subNs === 'load') extItems.push({ ns, path })
       else items.push(mod[item][i])
     }

package/package.json

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