dobo 1.1.2 → 1.1.4

package/bajoCli/applet/model-rebuild.js

@@ -18,7 +18,6 @@ async function modelRebuild (...args) {
   const isMatch = outmatch(map(names.split(' '), m => trim(m)))
   names = schemas.filter(isMatch)
   if (names.length === 0) return this.print.fail('No schema matched', true, { exit: this.app.bajo.applet })
-  names = names.sort()
   console.log(boxen(names.join(' '), { title: this.print.write('schema%d', names.length), padding: 0.5, borderStyle: 'round' }))
   const answer = await confirm({
     message: this.print.write('schemasWillBeRebuiltContinue'),
@@ -36,7 +35,7 @@ async function modelRebuild (...args) {
   const result = { succed: 0, failed: 0, skipped: 0 }
   const skipped = []
   for (const s of names) {
-    const { schema, instance, connection } = this.getInfo(s)
+    const { schema, instance } = this.getInfo(s)
     const spin = this.print.spinner({ showCounter: true }).start('rebuilding%s', schema.name)
     if (!instance) {
       spin.warn('clientInstanceNotConnected%s', schema.connection, schema.name)
@@ -44,10 +43,12 @@ async function modelRebuild (...args) {
       result.skipped++
       continue
     }
+    /*
     if (connection.memory) {
       spin.warn('memoryDbSkipped%s', schema.name)
       continue
     }
+    */
     const exists = await this.modelExists(schema.name, false, { spinner: spin })
     if (exists) {
       if (this.app.bajo.config.force) {

package/lib/collect-schemas.js

@@ -18,6 +18,7 @@ async function handler ({ file, alias, ns }) {
   mod.ns = ns
   mod.attachment = mod.attachment ?? true
   mod.feature = mod.feature ?? []
+  mod.buildLevel = mod.buildLevel ?? 999
   const feats = []
   if (isArray(mod.feature)) {
     each(mod.feature, f => {

package/lib/multi-rel-rows.js

@@ -1,6 +1,7 @@
 async function multiRelRows ({ schema, records, options = {} }) {
   const { isSet } = this.app.bajo
-  const props = schema.properties.filter(p => isSet(p.rel))
+  const props = schema.properties.filter(p => isSet(p.rel) && !(options.hidden ?? []).includes(p.name))
+  // const props = schema.properties.filter(p => isSet(p.rel))
   const rels = {}
   options.rels = options.rels ?? []
   if (props.length > 0) {

package/lib/sanitize-schema.js

@@ -36,7 +36,7 @@ async function sanitizeFullText (item) {
 
 async function sanitizeSchema (items) {
   const { freeze, fatal, importModule, defaultsDeep, join, breakNsPath, runHook } = this.app.bajo
-  const { map, keys, findIndex, find, each, isString, get, isPlainObject, camelCase, uniq, filter } = this.lib._
+  const { orderBy, map, keys, findIndex, find, each, isString, get, isPlainObject, camelCase, uniq, filter } = this.lib._
   const propTypes = keys(this.propType)
   const schemas = []
   this.log.debug('loadingDbSchemas')
@@ -185,7 +185,7 @@ async function sanitizeSchema (items) {
     schema.sortables = sortables
     await runHook(`dobo.${camelCase(schema.name)}:afterSanitizeSchema`, schema)
   }
-  this.schemas = schemas
+  this.schemas = orderBy(schemas, ['buildLevel', 'name'])
   freeze(this.schemas)
   this.log.debug('loadedSchemas%s', join(map(this.schemas, 'name')))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Database ORM/ODM for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/plugin/method/record/find-all.js

@@ -2,8 +2,10 @@ async function findAll (name, filter = {}, options = {}) {
   filter.page = 1
   filter.limit = 100
   options.dataOnly = true
+  const match = filter.match
   const all = []
   for (;;) {
+    filter.match = match
     const results = await this.recordFind(name, filter, options)
     if (results.length === 0) break
     all.push(...results)

package/waibuMpa/route/attachment/@model/@id/@field/@file.js

@@ -9,7 +9,7 @@ async function attachment (req, reply) {
   const file = `${getPluginDataDir('dobo')}/attachment/${pascalCase(req.params.model)}/${req.params.id}/${req.params.field}/${req.params.file}`
   const mimeType = mime.getType(path.extname(file))
   if (!fs.existsSync(file)) {
-    if (!req.query.notfound) throw this.error('_notFound', { noView: true })
+    if (!req.query.notfound) throw this.error('_notFound', { noContent: true })
     const [, ext] = mimeType.split('/')
     const replacer = isString(req.query.notfound) ? req.query.notfound : `waibuStatic.asset:/not-found.${ext}`
     return reply.redirectTo(routePath(replacer))