waibu 1.2.12 → 2.0.0

package/index.js

@@ -15,7 +15,7 @@ import queryString from 'query-string'
 async function factory (pkgName) {
   const me = this
 
-  return class Waibu extends this.lib.BajoPlugin {
+  return class Waibu extends this.lib.Plugin {
     constructor () {
       super(pkgName, me.app)
       this.alias = 'w'

package/lib/app.js

@@ -6,7 +6,8 @@ export async function collect (glob = 'boot.js', baseNs) {
   if (!baseNs) baseNs = this.name
   const mods = []
 
-  await eachPlugins(async function ({ config, file, ns, alias }) {
+  await eachPlugins(async function ({ file }) {
+    const { name: ns, alias, config } = this
     const mod = await importModule(file, { asHandler: true })
     mod.prefix = get(config, 'waibu.prefix', alias)
     if (get(config, 'intl.detectors', []).includes('path')) mod.prefix = `/:lang${mod.prefix}`

package/lib/collect-route-path-handlers.js

@@ -4,7 +4,8 @@ async function collectRoutePathHandlers () {
   this.routePathHandlers = this.routePathHandlers ?? {}
   const me = this
 
-  await eachPlugins(async function ({ ns }) {
+  await eachPlugins(async function () {
+    const { name: ns } = this
     if (isEmpty(this.routePathHandlers) || !this.routePath) return undefined
     for (const key of this.routePathHandlers) {
       me.routePathHandlers[key] = { handler: this.routePath, ns }

package/lib/webapp-scope/is-route-disabled.js

@@ -10,9 +10,13 @@ async function isRouteDisabled (url, method, matchers = []) {
   const items = []
   for (let m of cloneDeep(matchers)) {
     if (isString(m)) m = { path: m }
-    m.path = this.app.waibu.routePath(m.path)
-    m.methods = santizeMethods(m.methods)
-    items.push(m)
+    try {
+      m.path = this.app.waibu.routePath(m.path)
+      m.methods = santizeMethods(m.methods)
+      items.push(m)
+    } catch (err) {
+      throw this.error(`${m.path}: ${err.message}`)
+    }
   }
   const matcher = items.find(i => {
     const isMatch = outmatch(i.path)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "1.2.12",
+  "version": "2.0.0",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {