dobo 2.0.0 → 2.0.1

package/extend/bajoCli/applet/lib/post-process.js

@@ -1,18 +1,19 @@
 const conns = []
 
 async function postProcess ({ handler, params, path, processMsg, noConfirmation } = {}) {
-  const { saveAsDownload, importPkg } = this.app.bajo
-  const { prettyPrint } = this.app.bajoCli.helper
-  const { find, get } = this.lib._
-  const [stripAnsi, confirm] = await importPkg('bajoCli:strip-ansi', 'bajoCli:@inquirer/confirm')
-  if (!noConfirmation && this.config.confirmation === false) noConfirmation = true
-  params.push({ fields: this.config.fields, dataOnly: !this.config.full })
+  const { importPkg, generateId } = this.app.bajo
+  const { writeOutput } = this.app.bajoCli
+  const { find, get, isEmpty } = this.app.lib._
+  const [confirm] = await importPkg('bajoCli:strip-ansi', 'bajoCli:@inquirer/confirm')
+  const { confirmation, fields, full } = this.app.bajo.config
+  if (!noConfirmation && confirmation === false) noConfirmation = true
+  params.push({ fields, dataOnly: !full })
 
   const schema = find(this.schemas, { name: params[0] })
-  if (!schema) return this.print.fatal('notFound%s', this.print.write('field.schema'))
+  if (!schema) return this.print.fatal('notFound%s', this.t('field.schema'))
   let cont = true
   if (!noConfirmation) {
-    const answer = await confirm({ message: this.print.write('sureContinue'), default: false })
+    const answer = await confirm({ message: this.print.buildText('sureContinue'), default: false })
     if (!answer) {
       this.print.fail('aborted')
       cont = false
@@ -27,21 +28,26 @@ async function postProcess ({ handler, params, path, processMsg, noConfirmation
   }
   try {
     const resp = await this[handler](...params)
+    if (isEmpty(resp)) {
+      spin.warn('noResultFound')
+      return false
+    }
     spin.succeed('done')
-    const result = this.config.pretty ? (await prettyPrint(resp)) : JSON.stringify(resp, null, 2)
-    if (this.config.save) {
-      const id = resp.id ?? get(resp, 'data.id') ?? get(resp, 'oldData.id')
+    let actionPath = path
+    if (this.app.bajo.config.save) {
+      const id = resp.id ?? get(resp, 'data.id') ?? get(resp, 'oldData.id') ?? generateId()
       const base = path === 'recordFind' ? params[0] : (params[0] + '/' + id)
-      const file = `/${path}/${base}.${this.config.pretty ? 'txt' : 'json'}`
-      await saveAsDownload(file, stripAnsi(result))
-    } else console.log(result)
+      actionPath += `/${base}`
+    }
+    await writeOutput(resp, actionPath, true)
+    return true
   } catch (err) {
-    if (this.config.log.applet) {
+    if (this.app.bajo.config.log.applet) {
       spin.stop()
       console.error(err)
     } else spin.fail('error%s', err.message)
+    return false
   }
-  process.exit()
 }
 
 export default postProcess

package/extend/bajoCli/applet/model-clear.js

@@ -1,11 +1,11 @@
 import postProcess from './lib/post-process.js'
 
-async function modelClear (...args) {
+async function modelClear (path, ...args) {
   const { print } = this.app.bajo
-  const { isEmpty } = this.lib._
-  if (isEmpty(this.schemas)) return print.fail('notFound%s', 'schema', { exit: this.app.bajo.applet })
+  const { isEmpty } = this.app.lib._
+  if (isEmpty(this.schemas)) return print.fail('notFound%s', 'schema', { exit: this.app.applet })
   const [schema] = args
-  await postProcess.call(this, { handler: 'modelClear', params: [schema], path: 'modelClear', processMsg: 'Clear records' })
+  await postProcess.call(this, { handler: path, params: [schema], path, processMsg: 'Clear records' })
 }
 
 export default modelClear

package/extend/bajoCli/applet/model-rebuild.js

@@ -1,29 +1,29 @@
-import addFixtures from '../../lib/add-fixtures.js'
+import addFixtures from '../../../lib/add-fixtures.js'
 
-async function modelRebuild (...args) {
+async function modelRebuild (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { outmatch } = this.lib
-  const { isEmpty, map, trim, without } = this.lib._
+  const { outmatch } = this.app.lib
+  const { isEmpty, map, trim, without } = this.app.lib._
   const [input, confirm, boxen] = await importPkg('bajoCli:@inquirer/input',
     'bajoCli:@inquirer/confirm', 'bajoCli:boxen')
   const schemas = map(this.schemas, 'name')
   let names = args.join(' ')
-  if (isEmpty(schemas)) return this.print.fail('notFound%s', 'schema', { exit: this.app.bajo.applet })
+  if (isEmpty(schemas)) return this.print.fail('notFound%s', 'schema', { exit: this.app.applet })
   if (isEmpty(names)) {
     names = await input({
-      message: this.print.write('enterSchemaName'),
+      message: this.print.buildText('enterSchemaName'),
       default: '*'
     })
   }
   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 })
-  console.log(boxen(names.join(' '), { title: this.print.write('schema%d', names.length), padding: 0.5, borderStyle: 'round' }))
+  if (names.length === 0) return this.print.fail('No schema matched', true, { exit: this.app.applet })
+  console.log(boxen(names.join(' '), { title: this.t('schema%d', names.length), padding: 0.5, borderStyle: 'round' }))
   const answer = await confirm({
-    message: this.print.write('schemasWillBeRebuiltContinue'),
+    message: this.print.buildText('schemasWillBeRebuiltContinue'),
     default: false
   })
-  if (!answer) return this.print.fail('aborted', { exit: this.app.bajo.applet })
+  if (!answer) return this.print.fail('aborted', { exit: this.app.applet })
   /*
   const conns = []
   for (const s of names) {
@@ -36,7 +36,7 @@ async function modelRebuild (...args) {
   const skipped = []
   for (const s of names) {
     const { schema, instance } = this.getInfo(s)
-    const spin = this.print.spinner({ showCounter: true }).start('rebuilding%s', schema.name)
+    const spin = this.print.spinner().start('rebuilding%s', schema.name)
     if (!instance) {
       spin.warn('clientInstanceNotConnected%s', schema.connection, schema.name)
       skipped.push(schema.name)
@@ -80,7 +80,7 @@ async function modelRebuild (...args) {
   if (result.failed > 0) this.print.fatal('cantContinueAddFixture')
   for (const s of without(names, ...skipped)) {
     const { schema, connection } = this.getInfo(s)
-    const spin = this.print.spinner({ showCounter: true }).start('addingFixture%s', schema.name)
+    const spin = this.print.spinner().start('addingFixture%s', schema.name)
     if (connection.memory) {
       spin.warn('memoryDbSkipped%s', schema.name)
       continue
@@ -95,7 +95,7 @@ async function modelRebuild (...args) {
       result.failed++
     }
   }
-  process.exit()
+  this.app.exit()
 }
 
 export default modelRebuild

package/extend/bajoCli/applet/record-create.js

@@ -2,27 +2,27 @@ import postProcess from './lib/post-process.js'
 
 async function createRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map, isPlainObject } = this.lib._
+  const { isEmpty, map, isPlainObject } = this.app.lib._
   const [input, select, boxen] = await importPkg('bajoCli:@inquirer/input',
     'bajoCli:@inquirer/select', 'bajoCli:boxen')
-  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.print.write('field.schema'), { exit: this.app.bajo.applet })
+  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.t('field.schema'), { exit: this.app.applet })
   let [schema, body] = args
   if (isEmpty(schema)) {
     schema = await select({
-      message: this.print.write('selectSchema'),
+      message: this.print.buildText('selectSchema'),
       choices: map(this.schemas, s => ({ value: s.name }))
     })
   }
   if (isEmpty(body)) {
     body = await input({
-      message: this.print.write('enterJsonPayload'),
+      message: this.print.buildText('enterJsonPayload'),
       validate: text => {
-        if (isEmpty(text)) return this.print.write('payloadRequired')
+        if (isEmpty(text)) return this.t('payloadRequired')
         try {
           const parsed = JSON.parse(text)
           if (!isPlainObject(parsed)) throw new Error()
         } catch (err) {
-          return this.print.write('payloadMustBeJson')
+          return this.t('payloadMustBeJson')
         }
         return true
       }
@@ -32,10 +32,12 @@ async function createRecord (path, ...args) {
   try {
     payload = JSON.parse(body)
   } catch (err) {
-    return this.print.fail('invalidPayloadSyntax', { exit: this.app.bajo.applet })
+    return this.print.fail('invalidPayloadSyntax', { exit: this.app.applet })
   }
   console.log(boxen(JSON.stringify(payload, null, 2), { title: schema, padding: 0.5, borderStyle: 'round' }))
-  await postProcess.call(this, { handler: 'recordCreate', params: [schema, payload], path, processMsg: 'Creating record' })
+  const result = await postProcess.call(this, { handler: 'recordCreate', params: [schema, payload], path, processMsg: 'Creating record' })
+  if (!result) await createRecord.call(this, path, ...args)
+  this.app.exit()
 }
 
 export default createRecord

package/extend/bajoCli/applet/record-find.js

@@ -2,26 +2,27 @@ import postProcess from './lib/post-process.js'
 
 async function findRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map, pick } = this.lib._
+  const { isEmpty, map, pick } = this.app.lib._
   const [select, input] = await importPkg('bajoCli:@inquirer/select', 'bajoCli:@inquirer/input')
-  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.print.write('field.schema'), { exit: this.app.bajo.applet })
+  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.t('field.schema'), { exit: this.app.applet })
   let [schema, query] = args
   if (isEmpty(schema)) {
     schema = await select({
-      message: this.print.write('selectSchema'),
+      message: this.print.buildText('selectSchema'),
       choices: map(this.schemas, s => ({ value: s.name }))
     })
   }
   if (isEmpty(query)) {
     query = await input({
-      message: this.print.write('enterQueryIfAny')
+      message: this.print.buildText('enterQueryIfAny')
     })
   }
   if (isEmpty(query)) query = {}
   const filter = pick(this.app.bajo.config, ['page', 'offset', 'pageSize', 'sort', 'limit'])
   filter.pageSize = filter.pageSize ?? filter.limit
   filter.query = query
-  await postProcess.call(this, { noConfirmation: true, handler: 'recordFind', params: [schema, filter], path, processMsg: 'Finding record(s)' })
+  const resp = await postProcess.call(this, { noConfirmation: true, handler: 'recordFind', params: [schema, filter], path, processMsg: 'Finding record(s)' })
+  if (!resp) await findRecord.call(this, path, ...args)
 }
 
 export default findRecord

package/extend/bajoCli/applet/record-get.js

@@ -2,20 +2,20 @@ import postProcess from './lib/post-process.js'
 
 async function getRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map } = this.lib._
+  const { isEmpty, map } = this.app.lib._
   const [input, select] = await importPkg('bajoCli:@inquirer/input', 'bajoCli:@inquirer/select')
-  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.print.write('field.schema'), { exit: this.app.bajo.applet })
+  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.t('field.schema'), { exit: this.app.applet })
   let [schema, id] = args
   if (isEmpty(schema)) {
     schema = await select({
-      message: this.print.write('Please select a schema:'),
+      message: this.print.buildText('Please select a schema:'),
       choices: map(this.schemas, s => ({ value: s.name }))
     })
   }
   if (isEmpty(id)) {
     id = await input({
-      message: this.print.write('Enter record ID:'),
-      validate: text => isEmpty(text) ? this.print.write('ID is required') : true
+      message: this.print.buildText('Enter record ID:'),
+      validate: text => isEmpty(text) ? this.t('ID is required') : true
     })
   }
   await postProcess.call(this, { noConfirmation: true, handler: 'recordGet', params: [schema, id], path, processMsg: 'Getting record' })

package/extend/bajoCli/applet/record-remove.js

@@ -2,20 +2,20 @@ import postProcess from './lib/post-process.js'
 
 async function removeRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map } = this.lib._
+  const { isEmpty, map } = this.app.lib._
   const [input, select] = await importPkg('bajoCli:@inquirer/input', 'bajoCli:@inquirer/select')
-  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.print.write('field.schema'), { exit: this.app.bajo.applet })
+  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.t('field.schema'), { exit: this.app.applet })
   let [schema, id] = args
   if (isEmpty(schema)) {
     schema = await select({
-      message: this.print.write('Please select a schema:'),
+      message: this.print.buildText('Please select a schema:'),
       choices: map(this.schemas, s => ({ value: s.name }))
     })
   }
   if (isEmpty(id)) {
     id = await input({
-      message: this.print.write('Enter record ID:'),
-      validate: text => isEmpty(text) ? this.print.write('ID is required') : true
+      message: this.print.buildText('Enter record ID:'),
+      validate: text => isEmpty(text) ? this.t('ID is required') : true
     })
   }
   await postProcess.call(this, { handler: 'recordRemove', params: [schema, id], path, processMsg: 'Removing record' })

package/extend/bajoCli/applet/record-update.js

@@ -2,33 +2,33 @@ import postProcess from './lib/post-process.js'
 
 async function updateRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map, isPlainObject } = this.lib._
+  const { isEmpty, map, isPlainObject } = this.app.lib._
   const [input, select, boxen] = await importPkg('bajoCli:@inquirer/input',
     'bajoCli:@inquirer/select', 'bajoCli:boxen')
-  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.print.write('field.schema'), { exit: this.app.bajo.applet })
+  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.t('field.schema'), { exit: this.app.applet })
   let [schema, id, body] = args
   if (isEmpty(schema)) {
     schema = await select({
-      message: this.print.write('selectSchema'),
+      message: this.print.buildText('selectSchema'),
       choices: map(this.schemas, s => ({ value: s.name }))
     })
   }
   if (isEmpty(id)) {
     id = await input({
-      message: this.print.write('enterRecordId'),
-      validate: text => isEmpty(text) ? this.print.write('idIsRequired') : true
+      message: this.print.buildText('enterRecordId'),
+      validate: text => isEmpty(text) ? this.t('idIsRequired') : true
     })
   }
   if (isEmpty(body)) {
     body = await input({
-      message: this.print.write('enterJsonPayload'),
+      message: this.print.buildText('enterJsonPayload'),
       validate: text => {
-        if (isEmpty(text)) return this.print.write('payloadRequired')
+        if (isEmpty(text)) return this.t('payloadRequired')
         try {
           const parsed = JSON.parse(text)
           if (!isPlainObject(parsed)) throw new Error()
         } catch (err) {
-          return this.print.write('payloadMustBeJson')
+          return this.t('payloadMustBeJson')
         }
         return true
       }
@@ -38,7 +38,7 @@ async function updateRecord (path, ...args) {
   try {
     payload = JSON.parse(body)
   } catch (err) {
-    return this.print.fail('invalidPayloadSyntax', { exit: this.app.bajo.applet })
+    return this.print.fail('invalidPayloadSyntax', { exit: this.app.applet })
   }
   console.log(boxen(JSON.stringify(payload, null, 2), { title: schema, padding: 0.5, borderStyle: 'round' }))
   await postProcess.call(this, { handler: 'recordUpdate', params: [schema, id, payload], path, processMsg: 'Updating record' })

package/extend/bajoCli/applet/schema.js

@@ -1,20 +1,20 @@
 async function schema (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map, find } = this.lib._
+  const { isEmpty, map, find } = this.app.lib._
   const { getOutputFormat, writeOutput } = this.app.bajoCli
   const select = await importPkg('bajoCli:@inquirer/select')
   const format = getOutputFormat()
-  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.print.write('field.schema'), { exit: this.app.bajo.applet })
+  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.t('field.schema'), { exit: this.app.applet })
   let name = args[0]
   if (isEmpty(name)) {
     const choices = map(this.schemas, s => ({ value: s.name }))
     name = await select({
-      message: this.print.write('selectSchema'),
+      message: this.print.buildText('selectSchema'),
       choices
     })
   }
   const result = find(this.schemas, { name })
-  if (!result) return this.print.fail('cantFindSchema%s', this.print.write('schema'), name, { exit: this.app.bajo.applet })
+  if (!result) return this.print.fail('cantFindSchema%s', this.t('schema'), name, { exit: this.app.applet })
   this.print.info('done')
   await writeOutput(result, path, format)
 }

package/extend/bajoCli/applet/stat-count.js

@@ -2,19 +2,19 @@ import postProcess from './lib/post-process.js'
 
 async function statCount (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map } = this.lib._
+  const { isEmpty, map } = this.app.lib._
   const [select, input] = await importPkg('bajoCli:@inquirer/select', 'bajoCli:@inquirer/input')
-  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.print.write('field.schema'), { exit: this.app.bajo.applet })
+  if (isEmpty(this.schemas)) return this.print.fail('notFound%s', this.t('field.schema'), { exit: this.app.applet })
   let [schema, query] = args
   if (isEmpty(schema)) {
     schema = await select({
-      message: this.print.write('selectSchema'),
+      message: this.print.buildText('selectSchema'),
       choices: map(this.schemas, s => ({ value: s.name }))
     })
   }
   if (isEmpty(query)) {
     query = await input({
-      message: this.print.write('enterQueryIfAny')
+      message: this.print.buildText('enterQueryIfAny')
     })
   }
   const filter = { query }

package/extend/dobo/feature/created-at.js

@@ -8,7 +8,7 @@ async function createdAt (opts = {}) {
     },
     hook: {
       beforeCreate: async function ({ body }) {
-        const { isSet } = this.lib.aneka
+        const { isSet } = this.app.lib.aneka
         const now = new Date()
         if (opts.overwrite || !isSet(body[opts.fieldName])) body[opts.fieldName] = now
       }

package/extend/dobo/feature/removed-at.js

@@ -1,6 +1,6 @@
 async function beforeFind ({ filter = {}, options }, opts) {
   filter.query = filter.query ?? {}
-  const { isEmpty, set } = this.lib._
+  const { isEmpty, set } = this.app.lib._
   const q = { $and: [] }
   if (!isEmpty(filter.query)) {
     if (filter.query.$and) q.$and.push(...filter.query.$and)
@@ -17,7 +17,7 @@ async function afterFind ({ records }, opts) {
 }
 
 async function afterGet ({ schema, id, record }, opts) {
-  const { isEmpty } = this.lib._
+  const { isEmpty } = this.app.lib._
   if (!isEmpty(record.data[opts.fieldName])) throw this.error('recordNotFound%s%s', id, schema.name, { statusCode: 404 })
   delete record.data[opts.fieldName]
 }
@@ -70,7 +70,7 @@ async function removedAt (opts = {}) {
       beforeRemove: async function ({ schema, id, options }) {
         const { recordUpdate, recordGet } = this.app.dobo
         await recordGet(schema.name, id, options)
-        const { set } = this.lib._
+        const { set } = this.app.lib._
         const body = set({}, opts.fieldName, new Date())
         const record = await recordUpdate(schema.name, id, body, { dataOnly: false, noValidation: true, noFeatureHook: true })
         options.record = { oldData: record.oldData }

package/extend/dobo/feature/updated-at.js

@@ -9,12 +9,12 @@ async function updatedAt (opts = {}) {
     },
     hook: {
       beforeCreate: async function ({ body }) {
-        const { isSet } = this.lib.aneka
+        const { isSet } = this.app.lib.aneka
         const now = new Date()
         if (opts.overwrite || !isSet(body[opts.fieldName])) body[opts.fieldName] = now
       },
       beforeUpdate: async function ({ body }) {
-        const { isSet } = this.lib.aneka
+        const { isSet } = this.app.lib.aneka
         const now = new Date()
         if (opts.overwrite || !isSet(body[opts.fieldName])) body[opts.fieldName] = now
       }

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

@@ -1,10 +1,10 @@
 import path from 'path'
 
 async function attachment (req, reply) {
-  const { isString, isEmpty, find } = this.lib._
-  const { pascalCase } = this.lib.aneka
+  const { isString, isEmpty, find } = this.app.lib._
+  const { pascalCase } = this.app.lib.aneka
   const { routePath } = this.app.waibu
-  const { fs } = this.lib
+  const { fs } = this.app.lib
   const items = await this.listAttachments({
     model: req.params.model,
     id: req.params.id,