dobo 1.0.2 → 1.0.4

package/lib/sanitize-schema.js

@@ -5,7 +5,7 @@ async function sanitizeFeature (item) {
   for (const f of item.feature) {
     const feature = get(this.feature, f.name) // source from collectFeature
     if (!feature) this.fatal('Unknown feature \'%s@%s\'', f.name, item.name)
-    let [ns, path] = f.name.split(':')
+    let [ns, path] = f.name.split('.')
     if (!path) ns = this.name
     const input = await feature.call(this.app[ns], f)
     let props = input.properties
@@ -35,8 +35,8 @@ async function sanitizeFullText (item) {
 }
 
 async function sanitizeSchema (items) {
-  const { freeze, fatal, importModule, defaultsDeep, join, breakNsPath } = this.app.bajo
-  const { map, keys, findIndex, find, each, isString, get, isPlainObject } = this.app.bajo.lib._
+  const { freeze, fatal, importModule, defaultsDeep, join, breakNsPath, runHook } = this.app.bajo
+  const { map, keys, findIndex, find, each, isString, get, isPlainObject, camelCase, uniq, filter } = this.app.bajo.lib._
   const properties = keys(this.propType)
   const schemas = []
   this.log.debug('Loading DB schemas')
@@ -44,13 +44,14 @@ async function sanitizeSchema (items) {
     this.log.trace('- %s (%d)', k, keys(items[k]).length)
     for (const f in items[k]) {
       const item = items[k][f]
+      await runHook(`dobo.${camelCase(item.name)}:beforeSanitizeSchema`, item)
       const conn = find(this.connections, { name: item.connection })
       if (!conn) fatal.call(this, 'Unknown connection \'%s@%s\'', item.name, item.connection)
       item.fullText = item.fullText ?? { fields: [] }
       item.indexes = item.indexes ?? []
-      const [ns, type] = breakNsPath(conn.type)
+      const { ns, path: type } = breakNsPath(conn.type)
       const driver = find(this.drivers, { type, ns, driver: conn.driver })
-      if (driver.lowerCaseColl) item.modelName = item.modelName.toLowerCase()
+      if (driver.lowerCaseColl) item.name = item.name.toLowerCase()
       let file = `${ns}:/${this.name}/lib/${type}/prop-sanitizer.js`
       let propSanitizer = await importModule(file)
       if (!propSanitizer) propSanitizer = genericPropSanitizer
@@ -75,10 +76,8 @@ async function sanitizeSchema (items) {
       item.feature = item.feature ?? []
       await sanitizeFeature.call(this, item)
       item.disabled = item.disabled ?? []
-      if (item.readonly) {
-        item.disabled = ['create', 'update', 'remove']
-        delete item.readonly
-      }
+      if (item.disabled === 'all') item.disabled = ['find', 'get', 'create', 'update', 'remove']
+      else if (item.disabled === 'readonly') item.disabled = ['create', 'update', 'remove']
       for (const idx in item.properties) {
         let prop = item.properties[idx]
         if (!prop.type) {
@@ -132,6 +131,8 @@ async function sanitizeSchema (items) {
   }
   for (const i in schemas) {
     const schema = schemas[i]
+    const sortables = []
+    const hidden = []
     for (const i2 in schema.properties) {
       const prop = schema.properties[i2]
       if (prop.type !== 'string') delete prop.maxLength
@@ -169,8 +170,19 @@ async function sanitizeSchema (items) {
         }
         // TODO: propSanitizer must be called again
       }
+      if (prop.hidden) hidden.push(prop.name)
+      if (prop.index) sortables.push(prop.name)
+      delete prop.hidden
       schema.properties[i2] = prop
     }
+    // sortables
+    each(schema.indexes, item => {
+      sortables.push(...item.fields)
+    })
+    // hidden
+    schema.hidden = uniq(filter((schema.hidden ?? []).concat(hidden), item => map(schema.properties, 'name').includes(item)))
+    schema.sortables = sortables
+    await runHook(`dobo.${camelCase(schema.name)}:afterSanitizeSchema`, schema)
   }
   this.schemas = schemas
   freeze(this.schemas)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Database ORM/ODM for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,8 @@
   },
   "homepage": "https://github.com/ardhi/dobo#readme",
   "dependencies": {
-    "@tryghost/nql": "^0.12.3",
-    "joi": "^17.13.3"
+    "@tryghost/nql": "^0.12.7",
+    "joi": "^17.13.3",
+    "mingo": "^6.5.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/bajoCli/applet/shell.js

@@ -1,48 +0,0 @@
-const mods = [
-  { method: 'recordFind' },
-  { method: 'recordGet' },
-  { method: 'recordCreate' },
-  { method: 'recordUpdate' },
-  { method: 'recordRemove' },
-  '-',
-  { method: 'modelRebuild' },
-  '-',
-  { method: 'schema' },
-  { method: 'connection' },
-  '-',
-  { method: 'quit' },
-  '-'
-]
-
-async function shell ({ path, args, options }) {
-  const { importPkg, importModule, resolvePath, currentLoc } = this.app.bajo
-  const prompts = await importPkg('bajoCli:@inquirer/prompts')
-  const { map, find, repeat, kebabCase } = this.app.bajo.lib._
-  const { select, Separator, confirm } = prompts
-  const choices = map(mods, m => m === '-' ? new Separator() : ({ value: m.method }))
-  const dir = currentLoc(import.meta).dir
-  for (;;) {
-    const method = await select({
-      message: this.print.write('Select method:'),
-      choices
-    })
-    if (method === 'quit') {
-      const answer = await confirm({
-        message: this.print.write('Are you sure to quit?')
-      })
-      if (!answer) continue
-      this.print.info('Quitting now, have a nice day!')
-      process.kill(process.pid, 'SIGINT')
-      return
-    }
-    console.log(repeat('-', 80))
-    this.print.info('Running: %s', method)
-    const mod = find(mods, { method })
-    const file = `${dir}/${kebabCase(mod.method)}.js`
-    const instance = await importModule(resolvePath(file))
-    await instance.call(this, method, [])
-    console.log(repeat('-', 80))
-  }
-}
-
-export default shell