waibu 1.0.0 → 1.0.1

package/README.md

@@ -1,8 +1,8 @@
-# wakatobi
+# waibu
 
-Plugin name: **wakatobi**, alias: **wktb**
+Plugin name: **waibu**, alias: **waibu**
 
-![GitHub package.json version](https://img.shields.io/github/package-json/v/ardhi/wakatobi) ![NPM Version](https://img.shields.io/npm/v/wakatobi)
+![GitHub package.json version](https://img.shields.io/github/package-json/v/ardhi/waibu) ![NPM Version](https://img.shields.io/npm/v/waibu)
 
 > <br />**Attention**: I do NOT accept any pull request at the moment, thanks!<br /><br />
 
@@ -13,10 +13,10 @@ Plugin name: **wakatobi**, alias: **wktb**
 Goto your ```<bajo-base-dir>``` and type:
 
 ```bash
-$ npm install wakatobi
+$ npm install waibu
 ```
 
-Now open your ```<bajo-data-dir>/config/.plugins``` and put ```wakatobi``` in it
+Now open your ```<bajo-data-dir>/config/.plugins``` and put ```waibu``` in it
 
 ## License
 

package/bajo/.alias

@@ -0,0 +1 @@
+w

package/bajo/config.json

@@ -1,12 +1,13 @@
 {
-  "alias": "wktb",
   "server": {
     "host": "localhost",
     "port": 7777
   },
   "factory": {
-    "trustProxy": true
+    "trustProxy": true,
+    "bodyLimit": 10485760
   },
+  "prefixVirtual": "~",
   "qsKey": {
     "bbox": "bbox",
     "bboxLatField": "bboxLatField",
@@ -21,11 +22,6 @@
     "lang": "lang"
   },
   "paramsCharMap": {},
-  "dbColl": {
-    "dataOnly": false,
-    "count": false,
-    "patchEnabled": false
-  },
   "logRoutes": false,
   "siteInfo": {
     "title": "My Website",

package/bajo/hook/on-request.js

@@ -1,7 +1,10 @@
 const onRequest = {
   level: 5,
-  handler: async function onRequest (ctx, req, reply) {
+  handler: async function onRequest (req, reply) {
+    const { get } = this.app.bajo.lib._
+
     req.site = this.config.siteInfo
+    req.ns = get(reply.request, 'routeOptions.config.ns')
     let msg = '< %s:%s from IP %s'
     if (req.headers['content-length']) msg += ', content length: %s'
     this.log.info(msg, req.method, req.url, this.getIp(req), req.headers['content-length'])

package/bajo/hook/on-response.js

@@ -1,6 +1,6 @@
 const onResponse = {
   level: 5,
-  handler: async function onResponse (ctx, req, reply) {
+  handler: async function onResponse (req, reply) {
     let method = 'info'
     if (reply.statusCode >= 300 && reply.statusCode < 400) method = 'warn'
     else if (reply.statusCode >= 400) method = 'error'

package/bajo/hook/on-route.js

@@ -1,6 +1,6 @@
 const onRoute = {
   level: 5,
-  handler: async function (ctx, opts) {
+  handler: async function (opts) {
     this.routes.push(opts)
   }
 }

package/bajo/init.js

@@ -1,5 +1,8 @@
+import collectRoutePathHandlers from '../lib/collect-route-path-handlers.js'
+
 async function init () {
   if (this.config.home === '/') this.config.home = false
+  await collectRoutePathHandlers.call(this)
 }
 
 export default init

package/bajo/method/escape-chars.js

@@ -0,0 +1,6 @@
+export default {
+  '<': '&lt;',
+  '>': '&gt;',
+  '"': '&quot;',
+  "'": '&apos;'
+}

package/bajo/method/escape.js

@@ -0,0 +1,11 @@
+import escapeChars from './escape-chars.js'
+
+function escape (text) {
+  const { forOwn } = this.app.bajo.lib._
+  forOwn(escapeChars, (v, k) => {
+    text = text.replaceAll(k, v)
+  })
+  return text
+}
+
+export default escape

package/bajo/method/fetch.js

@@ -0,0 +1,19 @@
+async function fetch (url, opts = {}, extra = {}) {
+  const { getPlugin } = this.app.bajo
+  getPlugin('bajoExtra')
+  const { fetch } = this.app.bajoExtra
+  extra.rawResponse = true
+
+  url = this.routePath(url, { guessHost: true })
+  const resp = await fetch(url, opts, extra)
+  const result = await resp.json()
+  if (!resp.ok) {
+    throw this.error(result.message, {
+      statusCode: resp.status,
+      success: false
+    })
+  }
+  return result
+}
+
+export default fetch

package/bajo/method/get-plugin-by-prefix.js

@@ -0,0 +1,13 @@
+function getPluginByPrefix (prefix) {
+  const { get } = this.app.bajo.lib._
+  let plugin
+  for (const p of this.app.bajo.pluginNames) {
+    if (get(this, `app.${p}.config.waibu.prefix`) === prefix) {
+      plugin = this.app[p]
+      break
+    }
+  }
+  return plugin
+}
+
+export default getPluginByPrefix

package/bajo/method/get-plugin-prefix.js

@@ -0,0 +1,7 @@
+function getPluginPrefix (base) {
+  const { get, trim } = this.app.bajo.lib._
+  const prefix = get(this, `app.${base}.config.waibu.prefix`, this.app[base].alias)
+  return trim(prefix, '/')
+}
+
+export default getPluginPrefix

package/bajo/method/not-found.js

@@ -1,5 +1,5 @@
 function notFound (name, options) {
-  throw this.error('notfound', { path: name })
+  throw this.error('notFound', { path: name })
 }
 
 export default notFound

package/bajo/method/qs.js

@@ -0,0 +1,17 @@
+import queryString from 'query-string'
+
+function parse (item) {
+  return queryString.parse(item, {
+    parseBooleans: true,
+    parseNumbers: true
+  })
+}
+
+const qs = {
+  parse,
+  parseUrl: queryString.parseUrl,
+  stringify: queryString.stringify,
+  stringifyUrl: queryString.stringifyUrl
+}
+
+export default qs

package/bajo/method/route-dir.js

@@ -1,10 +1,12 @@
 function routeDir (ns, base) {
+  const { get } = this.app.bajo.lib._
   if (!base) base = ns
   const cfg = this.app[base].config
-  const dir = cfg.prefix === '' ? '' : `/${cfg.prefix || this.app[base].alias}`
+  const prefix = get(cfg, 'waibu.prefix', this.app[base].alias)
+  const dir = prefix === '' ? '' : `/${prefix}`
   if (!ns) return dir
-  if (ns === base || (ns === this.app.bajo.mainNs && cfg.mountAppAsRoot)) return dir
-  return dir + '/' + this.app[ns].alias
+  if (ns === base || (ns === this.app.bajo.mainNs && cfg.mountMainAsRoot)) return dir
+  return dir + `/${get(this.app[ns].config, 'waibu.prefix', this.app[ns].alias)}`
 }
 
 export default routeDir

package/bajo/method/route-path.js

@@ -1,24 +1,29 @@
-import qs from 'querystring'
-
-function routePath (name, { query = {}, base = 'wakatobiMpa', params = {} } = {}) {
-  // TODO: what if wakatobiMpa isn't loaded?
-  const { defaultsDeep } = this.app.bajo
-  const { isEmpty, get } = this.app.bajo.lib._
+function routePath (name = '', { query = {}, base = 'waibuMpa', params = {}, guessHost } = {}) {
+  const { defaultsDeep, getPlugin } = this.app.bajo
+  const { isEmpty, get, trimEnd, trimStart } = this.app.bajo.lib._
   const { breakNsPath } = this.app.bajo
-  const cfg = this.app[base].config ?? {}
-  let ns
-  let fullPath
-  if (name.startsWith('/')) fullPath = name
-  else [ns, fullPath] = breakNsPath(name)
-  let [path, queryString] = fullPath.split('?')
-  path = path.split('/').map(p => {
+
+  const plugin = getPlugin(base)
+  const cfg = plugin.config ?? {}
+  let info = {}
+  if (['.', '/', '?', '#'].includes(name[0]) || name.slice(1, 2) === ':') info.path = name
+  else if (['~'].includes(name[0])) info.path = name.slice(1)
+  else {
+    info = breakNsPath(name)
+  }
+  if (info.path.slice(0, 2) === './') info.path = info.path.slice(2)
+  if (this.routePathHandlers[info.subNs]) return this.routePathHandlers[info.subNs](name)
+  if (info.path.includes('//')) return info.path
+
+  info.path = info.path.split('/').map(p => {
     return p[0] === ':' && params[p.slice(1)] ? params[p.slice(1)] : p
   }).join('/')
-  let url = path
+  let url = info.path
   const langDetector = get(cfg, 'i18n.detectors', [])
-  if (ns) url = langDetector.includes('path') ? `/${params.lang ?? ''}${this.routeDir(ns)}${path}` : `${this.routeDir(ns)}${path}`
-  queryString = defaultsDeep(query, qs.parse(queryString))
-  if (!isEmpty(queryString)) url += '?' + qs.stringify(queryString)
+  if (info.ns) url = trimEnd(langDetector.includes('path') ? `/${params.lang ?? ''}${this.routeDir(info.ns)}${info.path}` : `${this.routeDir(info.ns)}${info.path}`, '/')
+  info.qs = defaultsDeep({}, query, info.qs)
+  if (!isEmpty(info.qs)) url += '?' + this.qs.stringify(info.qs)
+  if (!url.startsWith('http') && guessHost) url = `http://${this.config.server.host}:${this.config.server.port}/${trimStart(url, '/')}`
   return url
 }
 

package/bajo/method/unescape.js

@@ -0,0 +1,12 @@
+import escapeChars from './escape-chars.js'
+
+function unescape (text) {
+  const { forOwn, invert } = this.app.bajo.lib._
+  const mapping = invert(escapeChars)
+  forOwn(mapping, (v, k) => {
+    text = text.replaceAll(k, v)
+  })
+  return text
+}
+
+export default unescape

package/bajo/start.js

@@ -12,20 +12,24 @@ import handleRedirect from '../lib/handle-redirect.js'
 async function start () {
   const { generateId, runHook } = this.app.bajo
   const cfg = this.getConfig()
-  cfg.factory.logger = this.app.bajoLogger.instance.child(
+  cfg.factory.loggerInstance = this.app.bajoLogger.instance.child(
     {},
-    { msgPrefix: '[wakatobi] ' }
+    { msgPrefix: '[waibu] ' }
   )
   cfg.factory.genReqId = req => generateId()
   cfg.factory.disableRequestLogging = true
+  cfg.factory.querystringParser = str => this.qs.parse(str)
 
   const instance = fastify(cfg.factory)
   instance.decorateRequest('lang', null)
+  instance.decorateRequest('i18n', null)
+  instance.decorateRequest('t', () => {})
   instance.decorateRequest('langDetector', null)
   instance.decorateRequest('site', null)
+  instance.decorateRequest('ns', null)
   this.instance = instance
   this.routes = this.routes || []
-  await runHook('wakatobi:afterCreateContext', instance)
+  await runHook('waibu:afterCreateContext', instance)
   await instance.register(sensible)
   if (cfg.underPressure) await instance.register(underPressure)
   if (cfg.noIcon) await instance.register(noIcon)

package/lib/app-hook.js

@@ -4,11 +4,9 @@ async function appHook () {
   const me = this
   for (const hook of hooks) {
     me.instance.addHook(hook, async function (...args) {
+      args.push(this)
       if (['onClose', 'onReady'].includes(hook)) await runHook(`${me.name}:${hook}`, ...args)
-      else {
-        const ctx = this // encapsulated fastify scope
-        await runHook(`${me.name}:${hook}`, ctx, ...args)
-      }
+      else await runHook(`${me.name}:${hook}`, ...args)
     })
   }
 }

package/lib/app.js

@@ -2,15 +2,18 @@ import home from './home.js'
 
 export async function collect (glob = 'boot.js', baseNs) {
   const { eachPlugins, importModule } = this.app.bajo
-  const { orderBy } = this.app.bajo.lib._
+  const { orderBy, get } = this.app.bajo.lib._
   if (!baseNs) baseNs = this.name
   const mods = []
+
   await eachPlugins(async function ({ config, file, ns, alias }) {
     const mod = await importModule(file, { asHandler: true })
-    mod.prefix = config.prefix ?? alias
+    mod.prefix = get(config, 'waibu.prefix', alias)
+    if (get(config, 'i18n.detectors', []).includes('path')) mod.prefix = `/:lang${mod.prefix}`
     mod.ns = ns
+    mod.alias = alias
     mods.push(mod)
-  }, { glob, baseNs })
+  }, { glob, prefix: baseNs })
   const prefixes = {}
   mods.forEach(m => {
     if (!prefixes[m.prefix]) prefixes[m.prefix] = []
@@ -27,7 +30,12 @@ export async function boot () {
   for (const m of mods) {
     await runHook(`${this.name}.${m.ns}:beforeAppBoot`)
     this.log.debug('Boot app: %s', m.ns)
-    await m.handler.call(this.app[m.ns])
+    await this.instance.register(async (ctx) => {
+      const plugin = this.app[m.ns]
+      plugin.instance = ctx
+      await runHook(`${plugin.name}:afterCreateContext`, ctx)
+      await m.handler.call(plugin, ctx, m.prefix)
+    }, { prefix: m.prefix })
     await runHook(`${this.name}.${m.ns}:afterAppBoot`)
   }
   await runHook(`${this.name}:afterAppBoot`)

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

@@ -0,0 +1,15 @@
+async function collectRoutePathHandlers () {
+  const { eachPlugins } = this.app.bajo
+  const { isEmpty } = this.app.bajo.lib._
+  this.routePathHandlers = this.routePathHandlers ?? {}
+  const me = this
+
+  await eachPlugins(async function ({ alias }) {
+    if (isEmpty(this.routePathHandlers) || !this.routePath) return undefined
+    for (const key of this.routePathHandlers) {
+      me.routePathHandlers[key] = this.routePath
+    }
+  })
+}
+
+export default collectRoutePathHandlers

package/lib/handle-forward.js

@@ -15,11 +15,14 @@ async function handleForward (ctx) {
   const options = defaultsDeep({ base }, this.config.forwardOpts)
   await ctx.register(replyFrom, options)
 
-  await ctx.decorateReply('forwardTo', async function (url, options = {}) {
-    if (url.startsWith('http')) return await me.redirectTo(url)
-    return this.from(me.routePath(url, options), {
-      rewriteHeaders
-    })
+  ctx.decorateReply('forwardTo', async function (url, options = {}) {
+    if (url.startsWith('http')) this.redirectTo(url)
+    else {
+      this.from(me.routePath(url, options), {
+        rewriteHeaders
+      })
+    }
+    return this
   })
 }
 

package/lib/handle-redirect.js

@@ -2,9 +2,10 @@ import path from 'path'
 
 async function handleRedirect (ctx, options) {
   const me = this
-  ctx.decorateReply('redirectTo', async function (url, options = {}) {
-    if (url.startsWith('http') || path.isAbsolute(url)) return this.redirect(url)
-    return this.redirect(me.routePath(url, options))
+  ctx.decorateReply('redirectTo', function (url, options = {}) {
+    if (url.startsWith('http') || path.isAbsolute(url)) this.redirect(url)
+    else this.redirect(me.routePath(url, options))
+    return this
   })
 }
 

package/lib/home.js

@@ -5,9 +5,9 @@ async function home () {
   if (config.home) {
     if (isString(config.home)) config.home = { path: config.home }
     await this.instance.get('/', async function (req, reply) {
-      if (!config.home.forward) return await reply.redirectTo(config.home.path)
+      if (!config.home.forward) return reply.redirectTo(config.home.path)
       const opts = defaultsDeep(pick(req, ['params', 'query']), pick(config.home, ['params', 'query']))
-      return await reply.forwardTo(config.home.path, opts)
+      return reply.forwardTo(config.home.path, opts)
     })
   }
 }

package/lib/webapp-scope/attach-i18n.js

@@ -14,13 +14,12 @@ function detect (detector = [], req, reply) {
     const length = req.url.split('/').length
     let url = req.url.replace(`/${lang}`, `/${defLang}`)
     if (length > 2) url = req.url.replace(`/${lang}/`, `/${defLang}/`)
-    reply.redirectTo(url)
-    return
+    return reply.redirectTo(url)
   }
   // by query string
   lang = null
   if (detector.includes('qs')) {
-    lang = req.query[this.app.wakatobi.config.qsKey.lang]
+    lang = req.query[this.app.waibu.config.qsKey.lang]
     if (lang && supported.includes(lang)) {
       req.lang = lang
       req.langDetector = 'qs'
@@ -51,13 +50,21 @@ function detect (detector = [], req, reply) {
 
 async function attachI18N (detector = [], req, reply) {
   if (!this.app.bajoI18N) return
+  const { importModule } = this.app.bajo
   const { get } = this.app.bajo.lib._
+  const translate = await importModule('bajo:/boot/lib/translate.js')
   detect.call(this, detector, req, reply)
-  const i18n = this.app.bajoI18N.instance.cloneInstance()
-  const defNs = get(req, 'routeOptions.config.ns', 'wakatobi')
-  i18n.setDefaultNamespace(defNs)
-  await i18n.changeLanguage(req.lang)
-  req.i18n = i18n
+  const defNs = get(req, 'routeOptions.config.ns', this.name)
+  const opts = { defaultNS: defNs }
+  if (req.lang) opts.lng = req.lang
+  req.i18n = this.app.bajoI18N.instance.cloneInstance(opts)
+  req.t = (...args) => {
+    // const defNs = get(req, 'routeOptions.config.ns', this.name)
+    return translate.call(this.app[defNs], req.i18n, ...args)
+  }
+  req.format = (value, type = 'auto', opts) => {
+    return this.app.bajoI18N.format(value, type, req.lang, opts)
+  }
 }
 
 export default attachI18N

package/lib/webapp-scope/error-handler.js

@@ -1,17 +1,14 @@
 async function errorHandler (ctx, extHandler) {
   const me = this
   ctx.setErrorHandler(async function (err, req, reply) {
-    if (err.redirect) {
-      reply.redirect(err.redirect)
-      return
-    }
+    if (err.redirect) return reply.redirect(err.redirect)
     if (err.print) {
       reply.send(err.print)
       return
     }
-    if (me.app.bajo.config.log.level === 'trace' && !['notfound', 'redirect'].includes(err.message)) console.error(err)
-    if (extHandler) return await extHandler.call(me, ctx, err, req, reply)
-    if (err.message === 'notfound' || err.statusCode === 404) {
+    if (me.app.bajo.config.log.level === 'trace' && !['notFound', 'redirect'].includes(err.message)) console.error(err)
+    if (extHandler) return await extHandler.call(me, err, req, reply, ctx)
+    if (err.message === 'notFound' || err.statusCode === 404) {
       reply.code(err.statusCode)
       return
     }

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

@@ -9,7 +9,7 @@ async function isRouteDisabled (url, method, matchers = []) {
   const { intersection, cloneDeep } = this.app.bajo.lib._
   const items = []
   for (const m of cloneDeep(matchers)) {
-    m.path = this.app.wakatobi.routePath(m.path)
+    m.path = this.app.waibu.routePath(m.path)
     m.methods = santizeMethods(m.methods)
     items.push(m)
   }

package/{bajo/method → lib/webapp-scope}/merge-route-hooks.js

@@ -1,7 +1,6 @@
-import hookTypes from './hook-types.js'
-
 async function mergeRouteHooks (def, withHandler = true) {
   const { last, isFunction } = this.app.bajo.lib._
+  const { hookTypes } = this.app.waibu
   const hooks = [...hookTypes]
   const me = this
   if (withHandler) hooks.push('handler')
@@ -11,7 +10,8 @@ async function mergeRouteHooks (def, withHandler = true) {
     def[h] = async function (...args) {
       // TODO: hooks can be array of functions
       if (isFunction(last(args))) args.pop()
-      return await oldH.call(me, this, ...args)
+      args.push(this)
+      return await oldH.call(me, ...args)
     }
   }
 }

package/lib/webapp-scope/rerouted-path.js

@@ -1,5 +1,5 @@
 async function reroutedPath (path, mapper = {}) {
-  const { routePath } = this.app.wakatobi
+  const { routePath } = this.app.waibu
   let result
   for (let k in mapper) {
     const v = routePath(mapper[k])

package/lib/webapp-scope/route-hook.js

@@ -1,11 +1,11 @@
 async function routeHook (ns) {
   const ctx = this.app[ns].instance
   const { runHook } = this.app.bajo
-  const { hookTypes } = this.app.wakatobi
+  const { hookTypes } = this.app.waibu
   for (const hook of hookTypes) {
     ctx.addHook(hook, async function (...args) {
-      const context = this // encapsulated fastify scope
-      await runHook(`${ns}:${hook}`, context, ...args)
+      args.push(this)
+      await runHook(`${ns}:${hook}`, ...args)
     })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {
@@ -12,6 +12,7 @@
     "url": "git+https://github.com/ardhi/waibu.git"
   },
   "keywords": [
+    "waibu",
     "web",
     "webserver",
     "bajo",
@@ -26,21 +27,22 @@
   },
   "homepage": "https://github.com/ardhi/waibu#readme",
   "dependencies": {
-    "@fastify/accepts": "^4.3.0",
-    "@fastify/compress": "^7.0.3",
-    "@fastify/cookie": "^9.3.1",
-    "@fastify/cors": "^9.0.1",
-    "@fastify/flash": "^5.2.0",
-    "@fastify/formbody": "^7.4.0",
-    "@fastify/helmet": "^11.1.1",
-    "@fastify/multipart": "^8.3.0",
-    "@fastify/rate-limit": "^9.1.0",
-    "@fastify/reply-from": "^9.8.0",
-    "@fastify/sensible": "^5.6.0",
-    "@fastify/session": "^10.9.0",
-    "@fastify/static": "github:ardhi/fastify-static#v7.x",
-    "@fastify/under-pressure": "^8.5.1",
-    "fastify": "^4.28.1",
-    "fastify-no-icon": "^6.0.0"
+    "@fastify/accepts": "^5.0.2",
+    "@fastify/compress": "^8.0.1",
+    "@fastify/cookie": "^11.0.2",
+    "@fastify/cors": "^10.0.2",
+    "@fastify/flash": "^6.0.3",
+    "@fastify/formbody": "^8.0.2",
+    "@fastify/helmet": "^13.0.1",
+    "@fastify/multipart": "^9.0.2",
+    "@fastify/rate-limit": "^10.2.2",
+    "@fastify/reply-from": "^12.0.1",
+    "@fastify/sensible": "^6.0.2",
+    "@fastify/session": "^11.1.0",
+    "@fastify/static": "^8.0.4",
+    "@fastify/under-pressure": "^9.0.3",
+    "fastify": "^5.2.1",
+    "fastify-no-icon": "^7.0.0",
+    "query-string": "^9.1.1"
   }
 }

package/bajo/hook/bajoI18N@before-init.js

@@ -1,6 +0,0 @@
-async function bajoI18nBeforeInit () {
-  const config = this.app.bajoI18N.config
-  if (!config.fallbackNS.includes(this.name)) config.fallbackNS.push(this.name)
-}
-
-export default bajoI18nBeforeInit

package/bajo/method/get-params.js

@@ -1,18 +0,0 @@
-function getParams (req, ...items) {
-  const { map, trim, get } = this.app.bajo.lib._
-  let fields
-  req.query = req.query ?? {}
-  req.params = req.params ?? {}
-  if (req.query.fields) fields = map((req.query.fields ?? '').split(','), i => trim(i))
-  const params = {
-    fields,
-    count: get(this, 'config.dbColl.count', false),
-    body: req.body
-  }
-  items.forEach(i => {
-    params[i] = req.params[i]
-  })
-  return params
-}
-
-export default getParams

package/bajo/method/method-map.js

@@ -1,9 +0,0 @@
-const methodMap = {
-  create: 'POST',
-  find: 'GET',
-  get: 'GET',
-  update: 'PUT',
-  remove: 'DELETE'
-}
-
-export default methodMap

package/bajo/method/record/create.js

@@ -1,13 +0,0 @@
-import prepCrud from '../../../lib/prep-crud.js'
-
-async function create ({ coll, req, reply, body, options = {} }) {
-  this.app.bajo.getPlugin('dobo') // ensure dobo is loaded
-  const { recordCreate, attachmentFind } = this.app.dobo
-  const { name, input, opts } = prepCrud.call(this, { coll, req, body, options, args: ['coll'] })
-  const ret = await recordCreate(name, input, opts)
-  const { attachment, stats, mimeType } = req.query
-  if (attachment) ret.data._attachment = await attachmentFind(name, ret.data.id, { stats, mimeType })
-  return ret
-}
-
-export default create

package/bajo/method/record/find-one.js

@@ -1,19 +0,0 @@
-import prepCrud from '../../../lib/prep-crud.js'
-
-async function find ({ coll, req, reply, options = {} }) {
-  this.app.bajo.getPlugin('dobo') // ensure dobo is loaded
-  const { recordFindOne, attachmentFind } = this.app.dobo
-  const { name, opts } = prepCrud.call(this, { coll, req, options, args: ['coll'] })
-  opts.bboxLatField = req.query[this.config.qsKey.bboxLatField]
-  opts.bboxLngField = req.query[this.config.qsKey.bboxLngField]
-  const filter = this.parseFilter(req)
-  const ret = await recordFindOne(name, filter, opts)
-  ret.filter = filter
-  const { attachment, stats, mimeType } = req.query
-  if (attachment) {
-    ret.data._attachment = await attachmentFind(name, ret.data.id, { stats, mimeType })
-  }
-  return ret
-}
-
-export default find

package/bajo/method/record/find.js

@@ -1,20 +0,0 @@
-import prepCrud from '../../../lib/prep-crud.js'
-
-async function find ({ coll, req, reply, options = {} }) {
-  this.app.bajo.getPlugin('dobo') // ensure dobo is loaded
-  const { recordFind, attachmentFind } = this.app.dobo
-  const { name, opts } = prepCrud.call(this, { coll, req, options, args: ['coll'] })
-  opts.bboxLatField = req.query[this.config.qsKey.bboxLatField]
-  opts.bboxLngField = req.query[this.config.qsKey.bboxLngField]
-  const filter = this.parseFilter(req)
-  const ret = await recordFind(name, filter, opts)
-  const { attachment, stats, mimeType } = req.query
-  if (attachment) {
-    for (const d of ret.data) {
-      d._attachment = await attachmentFind(name, d.id, { stats, mimeType })
-    }
-  }
-  return ret
-}
-
-export default find

package/bajo/method/record/get.js

@@ -1,14 +0,0 @@
-import prepCrud from '../../../lib/prep-crud.js'
-
-async function get ({ coll, req, reply, id, options = {} }) {
-  this.app.bajo.getPlugin('dobo') // ensure dobo is loaded
-  const { recordGet, attachmentFind } = this.app.dobo
-  const { name, recId, opts } = prepCrud.call(this, { coll, req, id, options, args: ['coll', 'id'] })
-  opts.filter = this.parseFilter(req)
-  const ret = await recordGet(name, recId, opts)
-  const { attachment, stats, mimeType } = req.query
-  if (attachment) ret.data._attachment = await attachmentFind(name, id, { stats, mimeType })
-  return ret
-}
-
-export default get

package/bajo/method/record/remove.js

@@ -1,10 +0,0 @@
-import prepCrud from '../../../lib/prep-crud.js'
-
-async function remove ({ coll, req, reply, id, options = {} }) {
-  this.app.bajo.getPlugin('dobo') // ensure dobo is loaded
-  const { recordRemove } = this.app.dobo
-  const { name, recId, opts } = prepCrud.call(this, { coll, req, id, options, args: ['coll', 'id'] })
-  return await recordRemove(name, recId, opts)
-}
-
-export default remove

package/bajo/method/record/update.js

@@ -1,13 +0,0 @@
-import prepCrud from '../../../lib/prep-crud.js'
-
-async function update ({ coll, req, reply, id, body, options = {} }) {
-  this.app.bajo.getPlugin('dobo') // ensure dobo is loaded
-  const { recordUpdate, attachmentFind } = this.app.dobo
-  const { name, input, opts, recId } = prepCrud.call(this, { coll, req, body, id, options, args: ['coll', 'id'] })
-  const ret = await recordUpdate(name, recId, input, opts)
-  const { attachment, stats, mimeType } = req.query
-  if (attachment) ret.data._attachment = await attachmentFind(name, id, { stats, mimeType })
-  return ret
-}
-
-export default update

package/bajo/method/stat/aggregate.js

@@ -1,13 +0,0 @@
-import prepCrud from '../../../lib/prep-crud.js'
-
-async function aggregate ({ coll, req, reply, options = {} }) {
-  this.app.bajo.getPlugin('dobo') // ensure dobo is loaded
-  const { statAggregate } = this.app.dobo
-  const { name, opts } = prepCrud.call(this, { coll, req, options, args: ['coll'] })
-  for (const item of ['group', 'aggregate']) {
-    opts[item] = options[item] ?? req.params[item] ?? req.query[item]
-  }
-  return await statAggregate(name, this.parseFilter(req), opts)
-}
-
-export default aggregate

package/bajo/method/stat/histogram.js

@@ -1,13 +0,0 @@
-import prepCrud from '../../../lib/prep-crud.js'
-
-async function histogram ({ coll, req, reply, options = {} }) {
-  this.app.bajo.getPlugin('dobo') // ensure dobo is loaded
-  const { statHistogram } = this.app.dobo
-  const { name, opts } = prepCrud.call(this, { coll, req, options, args: ['coll'] })
-  for (const item of ['type', 'group', 'aggregate']) {
-    opts[item] = options[item] ?? req.params[item] ?? req.query[item]
-  }
-  return await statHistogram(name, this.parseFilter(req), opts)
-}
-
-export default histogram

package/lib/prep-crud.js

@@ -1,17 +0,0 @@
-function prepCrud ({ coll, body, id, req, options, args }) {
-  const { pascalCase } = this.app.bajo
-  const { cloneDeep, get } = this.app.bajo.lib._
-  const opts = cloneDeep(options)
-  const params = this.getParams(req, ...args)
-  for (const k of ['count', 'fields']) {
-    opts[k] = opts[k] ?? params[k]
-  }
-  opts.dataOnly = get(this, 'config.dbColl.dataOnly', false)
-  opts.req = req
-  const recId = id ?? params.id ?? req.query.id
-  const name = pascalCase(coll ?? params.coll)
-  const input = body ?? params.body
-  return { name, recId, input, opts }
-}
-
-export default prepCrud