dobo 1.1.1 → 1.1.3

package/bajo/intl/en-US.json

@@ -107,7 +107,6 @@
   "unknownFeature%s%s": "'Unknown feature '%s@%s'",
   "onlyAcceptFields%s%s": "Only accept array of field names or single string of field name '%s@%s'",
   "invalidFieldName%s%s": "Invalid field name '%s@%s'",
-  "error%s": "Error: %s",
   "succeedFailSkip%d%d%d": "Done! Succeded: %d, failed: %s, skipped: %d",
   "chooseConn": "Please choose a connection:",
   "sureContinue": "Are you sure to continue?",
@@ -117,6 +116,11 @@
   "addingFixtureToMemDb": "Adding fixture for memory database",
   "recordsAdded%s%d%d": "%s: %d of %d records added",
   "driverInstantiated%s%s": "- Driver '%s:%s' instantiated",
+  "cantContinueAddFixture": "Can't continue with fixture adding because one or more models failed to rebuilt",
+  "addingFixture%s": "Adding fixture '%s'...",
+  "fixtureAdded%s%s%s": "Fixture on '%s': added %s, rejected: %s",
+  "errorAddingFixture%s%s": "Error adding fixture on model '%s': %s",
+  "memoryDbSkipped%s": "'%s' is a memory DB, skipped",
   "field": {
     "id": "ID",
     "code": "Kode",

package/bajo/intl/id.json

@@ -105,7 +105,6 @@
   "unknownFeature%s%s": "'Unknown feature '%s@%s'",
   "onlyAcceptFields%s%s": "Only accept array of field names or single string of field name '%s@%s'",
   "invalidFieldName%s%s": "Invalid field name '%s@%s'",
-  "error%s": "Error: %s",
   "succeedFailSkip%d%d%d": "Done! Succeded: %d, failed: %s, skipped: %d",
   "chooseConn": "Please choose a connection:",
   "sureContinue": "Are you sure to continue?",

package/bajoCli/applet/connection.js

@@ -1,6 +1,6 @@
 async function connection (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map, find } = this.app.bajo.lib._
+  const { isEmpty, map, find } = this.lib._
   const select = await importPkg('bajoCli:@inquirer/select')
   const { getOutputFormat, writeOutput } = this.app.bajoCli
   const format = getOutputFormat()

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

@@ -3,7 +3,7 @@ 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.app.bajo.lib._
+  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 })

package/bajoCli/applet/model-clear.js

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

package/bajoCli/applet/model-rebuild.js

@@ -2,8 +2,8 @@ import addFixtures from '../../lib/add-fixtures.js'
 
 async function modelRebuild (...args) {
   const { importPkg } = this.app.bajo
-  const { outmatch } = this.app.bajo.lib
-  const { isEmpty, map, trim } = this.app.bajo.lib._
+  const { outmatch } = this.lib
+  const { isEmpty, map, trim, without } = this.lib._
   const [input, confirm, boxen] = await importPkg('bajoCli:@inquirer/input',
     'bajoCli:@inquirer/confirm', 'bajoCli:boxen')
   const schemas = map(this.schemas, 'name')
@@ -34,14 +34,20 @@ async function modelRebuild (...args) {
   */
   await this.start('all')
   const result = { succed: 0, failed: 0, skipped: 0 }
+  const skipped = []
   for (const s of names) {
     const { schema, instance, connection } = 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)
+      skipped.push(schema.name)
       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) {
@@ -61,11 +67,7 @@ async function modelRebuild (...args) {
     }
     try {
       await this.modelCreate(schema.name, { spinner: spin })
-      if (connection.memory) spin.succeed('modelCreated%s', schema.name)
-      else {
-        const fixture = await addFixtures.call(this, schema.name, { spinner: spin })
-        spin.succeed('modelCreatedWithFixture%s%s%s', schema.name, fixture.success, fixture.failed)
-      }
+      spin.succeed('modelCreated%s', schema.name)
       result.succed++
     } catch (err) {
       if (this.app.bajo.config.log.applet && this.app.bajo.config.log.level === 'trace') console.error(err)
@@ -74,6 +76,24 @@ async function modelRebuild (...args) {
     }
   }
   this.print.info('succeedFailSkip%d%d%d', result.succed, result.failed, result.skipped)
+  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)
+    if (connection.memory) {
+      spin.warn('memoryDbSkipped%s', schema.name)
+      continue
+    }
+    try {
+      const fixture = await addFixtures.call(this, schema.name, { spinner: spin })
+      spin.succeed('fixtureAdded%s%s%s', schema.name, fixture.success, fixture.failed)
+      result.succed++
+    } catch (err) {
+      if (this.app.bajo.config.log.applet && this.app.bajo.config.log.level === 'trace') console.error(err)
+      spin.fail('errorAddingFixture%s%s', schema.name, err.message)
+      result.failed++
+    }
+  }
   process.exit()
 }
 

package/bajoCli/applet/record-create.js

@@ -2,7 +2,7 @@ import postProcess from './lib/post-process.js'
 
 async function createRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map, isPlainObject } = this.app.bajo.lib._
+  const { isEmpty, map, isPlainObject } = this.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 })

package/bajoCli/applet/record-find.js

@@ -2,7 +2,7 @@ import postProcess from './lib/post-process.js'
 
 async function findRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map, pick } = this.app.bajo.lib._
+  const { isEmpty, map, pick } = this.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 })
   let [schema, query] = args

package/bajoCli/applet/record-get.js

@@ -2,7 +2,7 @@ import postProcess from './lib/post-process.js'
 
 async function getRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map } = this.app.bajo.lib._
+  const { isEmpty, map } = this.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 })
   let [schema, id] = args

package/bajoCli/applet/record-remove.js

@@ -2,7 +2,7 @@ import postProcess from './lib/post-process.js'
 
 async function removeRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map } = this.app.bajo.lib._
+  const { isEmpty, map } = this.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 })
   let [schema, id] = args

package/bajoCli/applet/record-update.js

@@ -2,7 +2,7 @@ import postProcess from './lib/post-process.js'
 
 async function updateRecord (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map, isPlainObject } = this.app.bajo.lib._
+  const { isEmpty, map, isPlainObject } = this.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 })

package/bajoCli/applet/schema.js

@@ -1,6 +1,6 @@
 async function schema (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map, find } = this.app.bajo.lib._
+  const { isEmpty, map, find } = this.lib._
   const { getOutputFormat, writeOutput } = this.app.bajoCli
   const select = await importPkg('bajoCli:@inquirer/select')
   const format = getOutputFormat()

package/bajoCli/applet/stat-count.js

@@ -2,7 +2,7 @@ import postProcess from './lib/post-process.js'
 
 async function statCount (path, ...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map } = this.app.bajo.lib._
+  const { isEmpty, map } = this.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 })
   let [schema, query] = args

package/dobo/feature/removed-at.js

@@ -1,6 +1,6 @@
 async function beforeFind ({ filter = {}, options }, opts) {
   filter.query = filter.query ?? {}
-  const { isEmpty, set } = this.app.bajo.lib._
+  const { isEmpty, set } = this.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.app.bajo.lib._
+  const { isEmpty } = this.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.app.bajo.lib._
+        const { set } = this.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/lib/add-fixtures.js

@@ -2,7 +2,7 @@ import path from 'path'
 
 async function addFixture (name, { spinner } = {}) {
   const { resolvePath, readConfig, eachPlugins } = this.app.bajo
-  const { isEmpty, isArray } = this.app.bajo.lib._
+  const { isEmpty, isArray } = this.lib._
   const { schema, connection } = this.getInfo(name)
   if (connection.proxy) {
     this.log.warn('proxiedConnBound%s', schema.name)

package/lib/build-bulk-action.js

@@ -1,6 +1,6 @@
 async function buildBulkAction (name, action, options = {}) {
   const { fs, importModule } = this.app.bajo
-  const { camelCase } = this.app.bajo.lib._
+  const { camelCase } = this.lib._
   const { schema, driver, connection } = await this.getInfo(name)
   if (!options.force && (schema.disabled ?? []).includes(action)) throw this.error('methodIsDisabled%s%s', camelCase('bulk ' + action), name)
   const file = `${driver.plugin}:/${this.name}/method/bulk/${action}.js`

package/lib/check-unique.js

@@ -1,8 +1,8 @@
 async function checkUnique ({ schema, body, id }) {
   const { isSet } = this.app.bajo
-  const { filter, map, set } = this.app.bajo.lib._
+  const { filter, map, set } = this.lib._
   const singles = map(filter(schema.properties, p => (p.index ?? {}).type === 'unique'), 'name')
-  const opts = { noHook: true, noCache: true, thrownNotFound: false, force: true }
+  const opts = { noHook: true, noCache: true, thrownNotFound: false, forceNoHidden: true }
   let old = {}
   if (id) old = (await this.recordGet(schema.name, id, opts)) ?? {}
   for (const s of singles) {
@@ -12,7 +12,7 @@ async function checkUnique ({ schema, body, id }) {
     const resp = await this.recordFind(schema.name, { query, limit: 1 }, opts)
     if (resp.length !== 0) {
       const details = [{ field: s, error: 'uniqueConstraintError', value: id }]
-      throw this.error('uniqueConstraintError', { details })
+      throw this.error('uniqueConstraintError', { details, body })
     }
   }
   const multis = filter(schema.indexes, i => i.type === 'unique')
@@ -26,12 +26,12 @@ async function checkUnique ({ schema, body, id }) {
       query[f] = body[f]
     }
     if (empty || same) continue
-    const resp = await this.recordFind(schema.name, { query, limit: 1 }, { noHook: true, noCache: true, force: true })
+    const resp = await this.recordFind(schema.name, { query, limit: 1 }, { noHook: true, noCache: true, forceNoHidden: true })
     if (resp.length !== 0) {
       const details = map(m.fields, f => {
         return { field: f, error: 'Unique constraint error' }
       })
-      throw this.error('Unique constraint error', { details })
+      throw this.error('Unique constraint error', { details, body })
     }
   }
 }

package/lib/collect-connections.js

@@ -5,7 +5,7 @@ async function defSanitizer (item) {
 async function collectConnections ({ item, index, options }) {
   const conn = item
   const { importModule, breakNsPath } = this.app.bajo
-  const { has, find } = this.app.bajo.lib._
+  const { has, find } = this.lib._
   if (!has(conn, 'type')) this.fatal('mustValidDbType')
   const { ns, path: type } = breakNsPath(conn.type)
   const driver = find(this.drivers, { ns, type })

package/lib/collect-drivers.js

@@ -1,6 +1,6 @@
 async function collectDrivers () {
   const { eachPlugins, readConfig, runHook } = this.app.bajo
-  const { isString, find, pick, merge, cloneDeep } = this.app.bajo.lib._
+  const { isString, find, pick, merge, cloneDeep } = this.lib._
   const me = this
   me.drivers = []
   // built-in memory driver

package/lib/collect-feature.js

@@ -2,7 +2,7 @@ import path from 'path'
 
 async function handler ({ file, alias, ns }) {
   const { importModule } = this.app.bajo
-  const { camelCase, isFunction } = this.app.bajo.lib._
+  const { camelCase, isFunction } = this.lib._
   const me = this.app.dobo
 
   let name = camelCase(path.basename(file, '.js'))

package/lib/collect-schemas.js

@@ -3,8 +3,8 @@ import sanitizeSchema from './sanitize-schema.js'
 
 async function handler ({ file, alias, ns }) {
   const { readConfig, pascalCase, eachPlugins } = this.app.bajo
-  const { get, isPlainObject, each, find, has, isArray, forOwn, isString, merge } = this.app.bajo.lib._
-  const { fastGlob } = this.app.bajo.lib
+  const { get, isPlainObject, each, find, has, isArray, forOwn, isString, merge } = this.lib._
+  const { fastGlob } = this.lib
 
   const base = path.basename(file, path.extname(file))
   const defName = pascalCase(`${alias} ${base}`)
@@ -70,7 +70,7 @@ async function handler ({ file, alias, ns }) {
 
 async function collectSchemas () {
   const { eachPlugins } = this.app.bajo
-  const { isEmpty } = this.app.bajo.lib._
+  const { isEmpty } = this.lib._
   const result = await eachPlugins(handler, { glob: 'schema/*.*', prefix: this.name })
   if (isEmpty(result)) this.log.warn('notFound%s', this.print.write('schema'))
   else await sanitizeSchema.call(this, result)

package/lib/exec-feature-hook.js

@@ -1,5 +1,5 @@
 async function execFeatureHook (name, params = {}) {
-  const { get } = this.app.bajo.lib._
+  const { get } = this.lib._
   const { schema } = params
   for (const f of schema.feature) {
     const fn = get(this.feature, f.name)

package/lib/exec-validation.js

@@ -1,6 +1,6 @@
 async function execValidation ({ name, body, options, partial }) {
   const { runHook } = this.app.bajo
-  const { keys, camelCase } = this.app.bajo.lib._
+  const { keys, camelCase } = this.lib._
   const { noHook } = options
   if (!noHook) {
     await runHook(`${this.name}:beforeRecordValidation`, name, body, options)

package/lib/generic-prop-sanitizer.js

@@ -2,7 +2,7 @@ const indexTypes = ['default', 'unique', 'primary', 'fulltext']
 
 async function genericPropSanitizer ({ prop, schema, driver }) {
   const { join } = this.app.bajo
-  const { has, get, each } = this.app.bajo.lib._
+  const { has, get, each } = this.lib._
   const def = this.propType[prop.type]
   // detect from drivers
   if (prop.type === 'string') {

package/lib/handle-attachment-upload.js

@@ -1,6 +1,6 @@
 async function handleAttachmentUpload ({ action, name, id, options = {} } = {}) {
   const { getPluginDataDir } = this.app.bajo
-  const { fs } = this.app.bajo.lib
+  const { fs } = this.lib
   const { req, mimeType, stats, setFile, setField } = options
 
   name = this.attachmentPreCheck(name)

package/lib/mem-db/conn-sanitizer.js

@@ -1,5 +1,5 @@
 async function connSanitizer (connection) {
-  const { pick } = this.app.bajo.lib._
+  const { pick } = this.lib._
   const result = pick(connection, ['type', 'name', 'driver'])
   result.memory = true
   return result

package/lib/mem-db/instantiate.js

@@ -2,8 +2,8 @@ let saving = false
 
 async function instantiate ({ connection, schemas, noRebuild }) {
   const { getPluginDataDir } = this.app.bajo
-  const { fs } = this.app.bajo.lib
-  const { pick } = this.app.bajo.lib._
+  const { fs } = this.lib
+  const { pick } = this.lib._
   this.memDb = this.memDb ?? {}
   this.memDb.storage = this.memDb.storage ?? {}
   this.memDb.instances = this.memDb.instances ?? []

package/lib/mem-db/method/record/find.js

@@ -2,7 +2,7 @@ import { Query } from 'mingo'
 
 async function find ({ schema, filter = {}, options = {} }) {
   const { prepPagination } = this.app.dobo
-  const { omit } = this.app.bajo.lib._
+  const { omit } = this.lib._
   const { limit, skip, sort, page } = await prepPagination(filter, schema)
   const criteria = filter.query ?? {}
   const q = new Query(criteria, { idKey: 'id' })

package/lib/mem-db/method/record/get.js

@@ -1,6 +1,6 @@
 async function get ({ schema, id, options = {} }) {
   const { thrownNotFound = true } = options
-  const { find } = this.app.bajo.lib._
+  const { find } = this.lib._
   const result = find(this.memDb.storage[schema.name], { id })
   if (!result && thrownNotFound) throw this.error('recordNotFound%s%s', id, schema.name, { statusCode: 404 })
   return { data: result }

package/lib/mem-db/method/record/remove.js

@@ -2,7 +2,7 @@ import getRecord from './get.js'
 
 async function remove ({ schema, id, options = {} }) {
   const { noResult } = options
-  const { findIndex, pullAt } = this.app.bajo.lib._
+  const { findIndex, pullAt } = this.lib._
   const rec = noResult ? undefined : await getRecord.call(this, { schema, id })
   const idx = findIndex(this.memDb.storage[schema.name], { id })
   pullAt(this.memDb.storage[schema.name], [idx])

package/lib/mem-db/method/record/update.js

@@ -2,7 +2,7 @@ import getRecord from './get.js'
 
 async function update ({ schema, id, body, options }) {
   const { noResult } = options
-  const { findIndex, merge } = this.app.bajo.lib._
+  const { findIndex, merge } = this.lib._
   const old = noResult ? undefined : await getRecord.call(this, { schema, id })
   const idx = findIndex(this.memDb.storage[schema.name], { id })
   const current = this.memDb.storage[schema.name][idx]

package/lib/mem-db/start.js

@@ -1,7 +1,7 @@
 import addFixtures from '../add-fixtures.js'
 
 async function start () {
-  const { filter, map } = this.app.bajo.lib._
+  const { filter, map } = this.lib._
 
   const conns = filter(this.connections, { type: 'dobo:memory' })
   const schemas = filter(this.schemas, s => {

package/lib/merge-attachment-info.js

@@ -1,7 +1,7 @@
 async function mergeAttachmentInfo (rec, source, { mimeType, stats, fullPath }) {
   const { importPkg } = this.app.bajo
-  const { fs } = this.app.bajo.lib
-  const { pick } = this.app.bajo.lib._
+  const { fs } = this.lib
+  const { pick } = this.lib._
   if (!this.app.waibu) return
   const mime = await importPkg('waibu:mime')
 

package/lib/resolve-method.js

@@ -1,7 +1,7 @@
 async function resolveMethod (name, method, options = {}) {
   const { importModule } = this.app.bajo
-  const { fs } = this.app.bajo.lib
-  const { camelCase } = this.app.bajo.lib._
+  const { fs } = this.lib
+  const { camelCase } = this.lib._
   const { schema, driver, connection } = this.getInfo(name)
   const [group, action] = method.split('-')
   if (!options.force && (schema.disabled ?? []).includes(action)) throw this.error('methodIsDisabled%s%s', camelCase(method), name)

package/lib/sanitize-schema.js

@@ -1,7 +1,7 @@
 import genericPropSanitizer from './generic-prop-sanitizer.js'
 
 async function sanitizeFeature (item) {
-  const { get, isPlainObject, mergeWith, isArray } = this.app.bajo.lib._
+  const { get, isPlainObject, mergeWith, isArray } = this.lib._
   for (const f of item.feature) {
     const feature = get(this.feature, f.name) // source from collectFeature
     if (!feature) this.fatal('unknownFeature%s%s', f.name, item.name)
@@ -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.app.bajo.lib._
+  const { map, keys, findIndex, find, each, isString, get, isPlainObject, camelCase, uniq, filter } = this.lib._
   const propTypes = keys(this.propType)
   const schemas = []
   this.log.debug('loadingDbSchemas')
@@ -151,7 +151,7 @@ async function sanitizeSchema (items) {
           }
           const rprop = find(rel.properties, { name: def.propName })
           if (!rprop) fatal.call(this, 'No property found for relationship \'%s@%s:%s\'', `${def.schema}:${def.propName}`, schema.name, prop.name)
-          def.fields = def.fields ?? []
+          def.fields = def.fields ?? '*'
           if (['*', 'all'].includes(def.fields)) {
             const relschema = find(schemas, { name: def.schema })
             def.fields = relschema.properties.map(p => p.name)

package/package.json

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

package/plugin/factory.js

@@ -95,9 +95,9 @@ async function factory (pkgName) {
 
     init = async () => {
       const { buildCollections } = this.app.bajo
-      const { fs } = this.app.bajo.lib
+      const { fs } = this.lib
       const checkType = async (item, items) => {
-        const { filter } = this.app.bajo.lib._
+        const { filter } = this.lib._
         const existing = filter(items, { type: 'dobo:memory' })
         if (existing.length > 1) this.fatal('onlyOneConnType%s', item.type)
       }
@@ -118,7 +118,7 @@ async function factory (pkgName) {
 
     start = async (conns = 'all', noRebuild = true) => {
       const { importModule, breakNsPath } = this.app.bajo
-      const { find, filter, isString, map } = this.app.bajo.lib._
+      const { find, filter, isString, map } = this.lib._
       if (conns === 'all') conns = this.connections
       else if (isString(conns)) conns = filter(this.connections, { name: conns })
       else conns = map(conns, c => find(this.connections, { name: c }))
@@ -133,8 +133,8 @@ async function factory (pkgName) {
     }
 
     pickRecord = async ({ record, fields, schema = {}, hidden = [], forceNoHidden } = {}) => {
-      const { isArray, pick, clone, isEmpty, omit } = this.app.bajo.lib._
-      const { dayjs } = this.app.bajo.lib
+      const { isArray, pick, clone, isEmpty, omit } = this.lib._
+      const { dayjs } = this.lib
 
       const transform = async ({ record, schema, hidden = [], forceNoHidden } = {}) => {
         if (record._id) {
@@ -186,7 +186,7 @@ async function factory (pkgName) {
       }
 
       const buildSort = (input, schema, allowSortUnindexed) => {
-        const { isEmpty, map, each, isPlainObject, isString, trim, keys } = this.app.bajo.lib._
+        const { isEmpty, map, each, isPlainObject, isString, trim, keys } = this.lib._
         let sort
         if (schema && isEmpty(input)) {
           const columns = map(schema.properties, 'name')
@@ -231,7 +231,7 @@ async function factory (pkgName) {
     }
 
     buildMatch = ({ input = '', schema, options }) => {
-      const { isPlainObject, trim } = this.app.bajo.lib._
+      const { isPlainObject, trim } = this.lib._
       const split = (value, schema) => {
         let [field, val] = value.split(':').map(i => i.trim())
         if (!val) {
@@ -264,7 +264,7 @@ async function factory (pkgName) {
     }
 
     buildQuery = async ({ filter, schema, options = {} } = {}) => {
-      const { trim, isString, isPlainObject } = this.app.bajo.lib._
+      const { trim, isString, isPlainObject } = this.lib._
       let query = {}
       if (isString(filter.query)) {
         filter.oquery = filter.query
@@ -286,13 +286,13 @@ async function factory (pkgName) {
     }
 
     getConnection = (name) => {
-      const { find } = this.app.bajo.lib._
+      const { find } = this.lib._
       return find(this.connections, { name })
     }
 
     getInfo = (name) => {
       const { breakNsPath } = this.app.bajo
-      const { find, map } = this.app.bajo.lib._
+      const { find, map } = this.lib._
       const schema = this.getSchema(name)
       const conn = this.getConnection(schema.connection)
       const { ns, path: type } = breakNsPath(conn.type)
@@ -304,13 +304,20 @@ async function factory (pkgName) {
     }
 
     getSchema = (input, cloned = true) => {
-      const { find, isPlainObject, cloneDeep } = this.app.bajo.lib._
+      const { find, isPlainObject, cloneDeep } = this.lib._
       let name = isPlainObject(input) ? input.name : input
       name = this.app.bajo.pascalCase(name)
       const schema = find(this.schemas, { name })
       if (!schema) throw this.error('unknownModelSchema%s', name)
       return cloned ? cloneDeep(schema) : schema
     }
+
+    getMemdbStorage = (name, fields = []) => {
+      const { map, pick } = this.lib._
+      const all = this.memDb.storage[name] ?? []
+      if (fields.length === 0) return all
+      return map(all, item => pick(item, fields))
+    }
   }
 }
 

package/plugin/method/attachment/copy-uploaded.js

@@ -1,7 +1,7 @@
 import path from 'path'
 
 async function copyUploaded (name, id, options = {}) {
-  const { fs } = this.app.bajo.lib
+  const { fs } = this.lib
   const { req, setField, setFile, mimeType, stats, silent = true } = options
   name = this.attachmentPreCheck(name)
   if (!name) {

package/plugin/method/attachment/create.js

@@ -1,7 +1,7 @@
 import mergeAttachmentInfo from '../../../lib/merge-attachment-info.js'
 
 async function create (name, id, options = {}) {
-  const { fs } = this.app.bajo.lib
+  const { fs } = this.lib
   name = this.attachmentPreCheck(name)
   if (!name) return
   const { source, field, file } = options

package/plugin/method/attachment/find.js

@@ -1,7 +1,7 @@
 import mergeAttachmentInfo from '../../../lib/merge-attachment-info.js'
 
 async function find (name, id, options = {}) {
-  const { fastGlob, fs } = this.app.bajo.lib
+  const { fastGlob, fs } = this.lib
   const { getPluginDataDir } = this.app.bajo
   name = this.attachmentPreCheck(name)
   if (!name) return

package/plugin/method/attachment/get-path.js

@@ -1,6 +1,6 @@
 async function getPath (name, id, field, file, options = {}) {
   const { pascalCase, getPluginDataDir } = this.app.bajo
-  const { fs } = this.app.bajo.lib
+  const { fs } = this.lib
   const dir = `${getPluginDataDir(this.name)}/attachment/${pascalCase(name)}/${id}`
   if (options.dirOnly) return dir
   const path = field ? `${dir}/${field}/${file}` : `${dir}/${file}`

package/plugin/method/attachment/get.js

@@ -1,7 +1,7 @@
 async function get (name, id, field, file, options = {}) {
   name = this.attachmentPreCheck(name)
   if (!name) return
-  const { find } = this.app.bajo.lib._
+  const { find } = this.lib._
   const all = await this.attachmentFind(name, id, options)
   if (field === 'null') field = null
   const data = find(all, { field, file })

package/plugin/method/attachment/remove.js

@@ -1,5 +1,5 @@
 async function remove (name, id, field, file, options = {}) {
-  const { fs } = this.app.bajo.lib
+  const { fs } = this.lib
   name = this.attachmentPreCheck(name)
   if (!name) return
   const path = await this.attachmentGetPath(name, id, field, file)

package/plugin/method/bulk/create.js

@@ -5,7 +5,7 @@ import execFeatureHook from '../../../lib/exec-feature-hook.js'
 async function create (name, inputs, options) {
   const { generateId, runHook, isSet } = this.app.bajo
   const { clearModel } = this.cache ?? {}
-  const { find } = this.app.bajo.lib._
+  const { find } = this.lib._
   options.dataOnly = options.dataOnly ?? true
   options.truncateString = options.truncateString ?? true
   const { noHook, noValidation } = options

package/plugin/method/model/clear.js

@@ -2,7 +2,7 @@ import resolveMethod from '../../../lib/resolve-method.js'
 
 async function clear (name, options = {}) {
   const { runHook } = this.app.bajo
-  const { camelCase } = this.app.bajo.lib._
+  const { camelCase } = this.lib._
 
   await this.modelExists(name, true)
   const { noHook } = options

package/plugin/method/model/create.js

@@ -2,7 +2,7 @@ import resolveMethod from '../../../lib/resolve-method.js'
 
 async function create (name, options = {}) {
   const { runHook } = this.app.bajo
-  const { camelCase } = this.app.bajo.lib._
+  const { camelCase } = this.lib._
 
   const { handler, schema } = await resolveMethod.call(this, name, 'model-create', options)
   if (!options.noHook) {

package/plugin/method/model/drop.js

@@ -2,7 +2,7 @@ import resolveMethod from '../../../lib/resolve-method.js'
 
 async function drop (name, options = {}) {
   const { runHook } = this.app.bajo
-  const { camelCase } = this.app.bajo.lib._
+  const { camelCase } = this.lib._
   const { handler, schema } = await resolveMethod.call(this, name, 'model-drop', options)
 
   if (!options.noHook) {

package/plugin/method/model/exists.js

@@ -5,7 +5,7 @@ const cache = {}
 async function exists (name, thrown, options = {}) {
   if (cache[name]) return cache[name]
   const { runHook } = this.app.bajo
-  const { camelCase } = this.app.bajo.lib._
+  const { camelCase } = this.lib._
   const { handler, schema } = await resolveMethod.call(this, name, 'model-exists', options)
   if (!options.noHook) {
     await runHook(`${this.name}:beforeModelExists`, schema, options)

package/plugin/method/record/clear.js

@@ -3,7 +3,7 @@ import resolveMethod from '../../../lib/resolve-method.js'
 async function clear (name, opts = {}) {
   const { runHook } = this.app.bajo
   await this.modelExists(name, true)
-  const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
+  const { cloneDeep, camelCase, omit } = this.lib._
   const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
   options.reply = opts.reply

package/plugin/method/record/count.js

@@ -4,7 +4,7 @@ import execFeatureHook from '../../../lib/exec-feature-hook.js'
 async function count (name, filter = {}, opts = {}) {
   const { runHook } = this.app.bajo
   const { get, set } = this.cache ?? {}
-  const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
+  const { cloneDeep, camelCase, omit } = this.lib._
   delete opts.record
   const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req

package/plugin/method/record/create.js

@@ -9,7 +9,7 @@ import singleRelRows from '../../../lib/single-rel-rows.js'
 async function create (name, input, opts = {}) {
   const { generateId, runHook, isSet } = this.app.bajo
   const { clearModel } = this.cache ?? {}
-  const { find, forOwn, cloneDeep, camelCase, omit, get, pick } = this.app.bajo.lib._
+  const { find, forOwn, cloneDeep, camelCase, omit, get, pick } = this.lib._
   delete opts.record
   const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req

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

@@ -5,7 +5,7 @@ import execFeatureHook from '../../../lib/exec-feature-hook.js'
 async function findOne (name, filter = {}, opts = {}) {
   const { runHook, isSet } = this.app.bajo
   const { get, set } = this.cache ?? {}
-  const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
+  const { cloneDeep, camelCase, omit } = this.lib._
   delete opts.record
   const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req

package/plugin/method/record/find.js

@@ -5,7 +5,7 @@ import execFeatureHook from '../../../lib/exec-feature-hook.js'
 async function find (name, filter = {}, opts = {}) {
   const { runHook, isSet } = this.app.bajo
   const { get, set } = this.cache ?? {}
-  const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
+  const { cloneDeep, camelCase, omit } = this.lib._
   delete opts.records
   const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req

package/plugin/method/record/get.js

@@ -5,7 +5,7 @@ import execFeatureHook from '../../../lib/exec-feature-hook.js'
 async function get (name, id, opts = {}) {
   const { runHook, isSet } = this.app.bajo
   const { get, set } = this.cache ?? {}
-  const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
+  const { cloneDeep, camelCase, omit } = this.lib._
   delete opts.record
   const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req

package/plugin/method/record/remove.js

@@ -5,7 +5,7 @@ import execFeatureHook from '../../../lib/exec-feature-hook.js'
 async function remove (name, id, opts = {}) {
   const { runHook } = this.app.bajo
   const { clearModel } = this.cache ?? {}
-  const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
+  const { cloneDeep, camelCase, omit } = this.lib._
   delete opts.record
   const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req

package/plugin/method/record/update.js

@@ -8,7 +8,7 @@ import singleRelRows from '../../../lib/single-rel-rows.js'
 async function update (name, id, input, opts = {}) {
   const { runHook, isSet } = this.app.bajo
   const { clearModel } = this.cache ?? {}
-  const { forOwn, find, cloneDeep, camelCase, omit, get } = this.app.bajo.lib._
+  const { forOwn, find, cloneDeep, camelCase, omit, get } = this.lib._
   delete opts.record
   const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req

package/plugin/method/record/upsert.js

@@ -1,8 +1,9 @@
 async function upsert (name, input, opts = {}) {
   const { generateId } = this.app.bajo
-  const { find } = this.app.bajo.lib._
-  const { cloneDeep, omit } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req', 'reply']))
+  const { find } = this.lib._
+  const { cloneDeep, omit, merge } = this.lib._
+  const { query, omitOnUpdate = [], omitOnCreate = [] } = opts
+  const options = cloneDeep(omit(opts, ['req', 'reply', 'query', 'omitOnUpdate', 'omitOnCreate']))
   options.req = opts.req
   options.reply = opts.reply
   options.dataOnly = options.dataOnly ?? true
@@ -13,9 +14,22 @@ async function upsert (name, input, opts = {}) {
   if (idField.type === 'string') id = input.id ?? generateId()
   else if (idField.type === 'integer') id = input.id ?? generateId('int')
   id = this.sanitizeId(id, schema)
-  const old = await this.recordGet(name, id, { thrownNotFound: false, dataOnly: true, noHook: true, noCache: true, force: true, hidden: options.hidden, forceNoHidden: options.forceNoHidden })
-  if (old) return await this.recordUpdate(name, id, input, options)
-  return await this.recordCreate(name, input, options)
+  let old
+  let body
+  const o = { dataOnly: true, noHook: true, noCache: true, hidden: options.hidden, forceNoHidden: options.forceNoHidden }
+  if (query) {
+    old = await this.recordFindOne(name, { query }, o)
+  } else {
+    o.thrownNotFound = false
+    old = await this.recordGet(name, id, o)
+  }
+  if (old) {
+    body = merge(omit(old, ['id', 'createdAt', 'updatedAt', 'removedAt']), omit(input, omitOnUpdate))
+    return await this.recordUpdate(name, old.id, body, options)
+  }
+  if (!query) input.id = id
+  body = omit(input, omitOnCreate)
+  return await this.recordCreate(name, body, options)
 }
 
 export default upsert

package/plugin/method/sanitize/body.js

@@ -1,6 +1,6 @@
 async function sanitizeBody ({ body = {}, schema = {}, partial, strict, extFields = [] }) {
   const { isSet, dayjs, callHandler } = this.app.bajo
-  const { has, isString, isNumber, concat } = this.app.bajo.lib._
+  const { has, isString, isNumber, concat } = this.lib._
   const result = {}
   for (const p of concat(schema.properties, extFields)) {
     if (partial && !has(body, p.name)) continue

package/plugin/method/sanitize/date.js

@@ -1,5 +1,5 @@
 function sanitizeDate (value, { input, output, silent = true } = {}) {
-  const { dayjs } = this.app.bajo.lib
+  const { dayjs } = this.lib
   if (value === 0) return null
   if (!output) output = input
   const dt = dayjs(value, input)

package/plugin/method/validate.js

@@ -20,7 +20,7 @@ function buildFromDbSchema (schema, { fields = [], rule = {}, extFields = [] } =
   const {
     isPlainObject, get, each, isEmpty, isString, forOwn, keys,
     find, isArray, has, cloneDeep, concat, without
-  } = this.app.bajo.lib._
+  } = this.lib._
   const obj = {}
   const me = this
   const refs = []
@@ -127,7 +127,7 @@ function buildFromDbSchema (schema, { fields = [], rule = {}, extFields = [] } =
 
 async function validate (value, joiSchema, { ns, fields, extFields, params } = {}) {
   const { defaultsDeep, isSet } = this.app.bajo
-  const { isString, forOwn, find } = this.app.bajo.lib._
+  const { isString, forOwn, find } = this.lib._
 
   ns = ns ?? [this.name]
   params = defaultsDeep(params, this.config.validationParams)

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

@@ -1,15 +1,15 @@
 import path from 'path'
 
 async function attachment (req, reply) {
-  const { isString } = this.app.bajo.lib._
+  const { isString } = this.lib._
   const { importPkg, getPluginDataDir, pascalCase } = this.app.bajo
   const { routePath } = this.app.waibu
   const mime = await importPkg('waibu:mime')
-  const { fs } = this.app.bajo.lib
+  const { fs } = this.lib
   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))

package/plugin/start.js

@@ -1,20 +0,0 @@
-import memDbStart from '../lib/mem-db/start.js'
-import memDbInstantiate from '../lib/mem-db/instantiate.js'
-
-async function start (conns = 'all', noRebuild = true) {
-  const { importModule, breakNsPath } = this.app.bajo
-  const { find, filter, isString, map } = this.app.bajo.lib._
-  if (conns === 'all') conns = this.connections
-  else if (isString(conns)) conns = filter(this.connections, { name: conns })
-  else conns = map(conns, c => find(this.connections, { name: c }))
-  for (const c of conns) {
-    const { ns } = breakNsPath(c.type)
-    const schemas = filter(this.schemas, { connection: c.name })
-    const mod = c.type === 'dobo:memory' ? memDbInstantiate : await importModule(`${ns}:/${this.name}/boot/instantiate.js`)
-    await mod.call(this.app[ns], { connection: c, noRebuild, schemas })
-    this.log.trace('driverInstantiated%s%s', c.driver, c.name)
-  }
-  await memDbStart.call(this)
-}
-
-export default start