dobo 2.22.1 → 2.24.0

package/extend/bajo/intl/en-US.json

@@ -141,7 +141,7 @@
   "invalidIdType%s%s": "Invalid ID type for '%s'. Please only use one of these: %s",
   "noDefaultConnection": "No default connection found. All models will use the built-in memory database instead",
   "recordImmutable%s%s": "Record with ID: '%s' & model: '%s' is immutable and can't be modified or deleted",
-  "notSupported%s%s%s": "%s|upperFirst '%s' is not supported by driver '%s'",
+  "notSupportedDriver%s%s%s": "%s|upperFirst '%s' is not supported by driver '%s'",
   "inMemoryDb%s%s": "'%s' is an in-memory database, %s is not allowed",
   "buildOp": "'build' operation",
   "dropOp": "'drop' operation",

package/extend/bajo/intl/id.json

@@ -140,6 +140,7 @@
   "invalidIdType%s%s": "Invalid ID type for '%s'. Please only use one of these: %s",
   "noDefaultConnection": "No default connection found. All models will use the built-in memory database instead",
   "recordImmutable%s%s": "Data dengan ID: '%s' & model: '%s' adalah immutable dan tidak bisa diubah atau dihapus",
+  "notSupportedDriver%s%s%s": "%s|upperFirst '%s' tidak didukung oleh driver '%s'",
   "inMemoryDb%s%s": "'%s' adalah database in-memory, %s tidak diizinkan",
   "buildOp": "operasi 'build'",
   "dropOp": "operasi 'drop'",

package/extend/dobo/driver/memory.js

@@ -11,7 +11,6 @@ async function memoryDriverFactory () {
       this.idGenerator = 'ulid'
       this.saving = true
       this.memory = true
-      this.autoSave = []
       this.storage = {}
       this.support = {
         propType: {
@@ -21,19 +20,6 @@ async function memoryDriverFactory () {
       }
     }
 
-    async _loadFromFile (model, dir) {
-      const { fs } = this.app.lib
-      this.autoSave.push(model.name)
-      const file = `${dir}/${model.name}.json`
-      if (!fs.existsSync(file)) return
-      try {
-        const data = fs.readFileSync(file, 'utf8')
-        this.storage[model.name] = JSON.parse(data)
-      } catch (err) {
-        this.fatal('cantLoad%s%s', model.name, err.message)
-      }
-    }
-
     async sanitizeConnection (conn) {
       await super.sanitizeConnection(conn)
       conn.memory = true
@@ -41,27 +27,42 @@ async function memoryDriverFactory () {
 
     async connect (connection, noRebuild) {
       const conn = this.plugin.getConnection('memory')
-      const models = this.plugin.getModelsByConnection(conn.name)
       const { getPluginDataDir } = this.app.bajo
       const { fs } = this.app.lib
-      const pdir = `${getPluginDataDir(this.plugin.ns)}/memDb/data` // persistence dir
-      fs.ensureDirSync(pdir)
-      conn.autoSave = conn.autoSave ?? []
+      const dir = `${getPluginDataDir(this.plugin.ns)}/memDb/data` // persistence dir
+      fs.ensureDirSync(dir)
+      conn.persistences = conn.persistences ?? []
+
+      const models = this.plugin.getModelsByConnection(conn.name).map(model => {
+        if (conn.persistences.includes(model.name)) model.options.persistence = true
+        return model
+      })
+
       for (const model of models) {
         this.storage[model.name] = this.storage[model.name] ?? [] // init empty model
-        if (conn.autoSave.includes(model.name)) await this._loadFromFile(model, pdir)
-        await model.loadFixtures()
+        if (model.options.persistence) {
+          const file = `${dir}/${model.name}.json`
+          let data = []
+          if (fs.existsSync(file)) {
+            try {
+              data = JSON.parse(fs.readFileSync(file, 'utf8'))
+            } catch (err) {}
+          }
+          if (data.length === 0) await model.loadFixtures({ ignoreError: false })
+          else this.storage[model.name] = data
+        } else await model.loadFixtures({ ignoreError: false })
       }
-      if (conn.autoSave.length === 0) return
       setInterval(() => {
         if (!this.saving) return
         this.saving = true
-        for (const item of conn.autoSave) {
-          const data = this.storage[item]
-          fs.writeFileSync(`${pdir}/${item}.json`, JSON.stringify(data), 'utf8')
+        for (const model of models) {
+          if (!model.options.persistence) continue
+          try {
+            fs.writeFileSync(`${dir}/${model.name}.json`, JSON.stringify(this.storage[model.name], null, 2), 'utf8')
+          } catch (err) {}
         }
         this.saving = false
-      }, this.plugin.config.memDb.autoSaveDur)
+      }, this.plugin.config.memDb.persistenceDur)
     }
 
     async _getOldRecord (model, id, options = {}) {

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

@@ -1,3 +1,9 @@
+async function handler (body, options, opts) {
+  const { isSet } = this.app.lib.aneka
+  if (opts.noOverwrite) body[opts.field] = new Date()
+  else if (!isSet(body[opts.field])) body[opts.field] = new Date()
+}
+
 async function createdAt (opts = {}) {
   opts.field = opts.field ?? 'createdAt'
   opts.noOverwrite = opts.noOverwrite ?? false
@@ -10,9 +16,14 @@ async function createdAt (opts = {}) {
     hooks: [{
       name: 'beforeCreateRecord',
       handler: async function (body, options) {
-        const { isSet } = this.app.lib.aneka
-        if (opts.noOverwrite) body[opts.field] = new Date()
-        else if (!isSet(body[opts.field])) body[opts.field] = new Date()
+        await handler.call(this, body, options, opts)
+      }
+    }, {
+      name: 'beforeBulkCreateRecord',
+      handler: async function (bodies, options) {
+        for (const body of bodies) {
+          await handler.call(this, body, options, opts)
+        }
       }
     }]
   }

package/extend/dobo/feature/immutable.js

@@ -11,8 +11,7 @@ async function immutable (opts = {}) {
   return {
     properties: {
       name: opts.field,
-      type: 'boolean',
-      hidden: true
+      type: 'boolean'
     },
     hooks: [{
       name: 'beforeUpdateRecord',

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

@@ -43,6 +43,13 @@ async function removedAt (opts = {}) {
       handler: async function (body, options) {
         await beforeCreateRecord.call(this, { body }, opts)
       }
+    }, {
+      name: 'beforeBulkCreateRecord',
+      handler: async function (bodies, options) {
+        for (const body of bodies) {
+          await beforeCreateRecord.call(this, { body }, opts)
+        }
+      }
     }, {
       name: 'beforeUpdateRecord',
       handler: async function (id, body, options) {

package/extend/dobo/feature/unique.js

@@ -1,7 +1,16 @@
 import crypto from 'crypto'
 
-async function unique (opts = {}) {
+async function handler (body, options, opts) {
   const { omit } = this.app.lib._
+  if (opts.fields.length === 0) opts.fields = omit(this.properties.map(prop => prop.name), [opts.field])
+  const item = {}
+  for (const f of opts.fields) {
+    item[f] = body[f]
+  }
+  body[opts.field] = crypto.createHash('md5').update(JSON.stringify(item)).digest('hex')
+}
+
+async function unique (opts = {}) {
   opts.field = opts.field ?? 'id'
   opts.fields = opts.fields ?? []
   return {
@@ -16,12 +25,15 @@ async function unique (opts = {}) {
       name: 'beforeCreateRecord',
       level: 1000,
       handler: async function (body, options) {
-        if (opts.fields.length === 0) opts.fields = omit(this.properties.map(prop => prop.name), [opts.field])
-        const item = {}
-        for (const f of opts.fields) {
-          item[f] = body[f]
+        await handler.call(this, body, options, opts)
+      }
+    }, {
+      name: 'beforeBulkCreateRecord',
+      level: 1000,
+      handler: async function (bodies, options) {
+        for (const body of bodies) {
+          await handler.call(this, body, options, opts)
         }
-        body[opts.field] = crypto.createHash('md5').update(JSON.stringify(item)).digest('hex')
       }
     }]
   }

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

@@ -1,5 +1,10 @@
-async function updatedAt (opts = {}) {
+async function createHandler (body, options, opts) {
   const { isSet } = this.app.lib.aneka
+  if (opts.noOverwrite) body[opts.field] = new Date()
+  else if (!isSet(body[opts.field])) body[opts.field] = new Date()
+}
+
+async function updatedAt (opts = {}) {
   opts.field = opts.field ?? 'updatedAt'
   opts.noOverwrite = opts.noOverwrite ?? false
   return {
@@ -11,14 +16,19 @@ async function updatedAt (opts = {}) {
     hooks: [{
       name: 'beforeCreateRecord',
       handler: async function (body, options) {
-        if (opts.noOverwrite) body[opts.field] = new Date()
-        else if (!isSet(body[opts.field])) body[opts.field] = new Date()
+        await createHandler.call(this, body, options, opts)
+      }
+    }, {
+      name: 'beforeBulkCreateRecord',
+      handler: async function (bodies, options) {
+        for (const body of bodies) {
+          await createHandler.call(this, body, options, opts)
+        }
       }
     }, {
       name: 'beforeUpdateRecord',
       handler: async function (id, body, options) {
-        if (opts.noOverwrite) body[opts.field] = new Date()
-        else if (!isSet(body[opts.field])) body[opts.field] = new Date()
+        await createHandler.call(this, body, options, opts)
       }
     }]
   }

package/index.js

@@ -164,7 +164,7 @@ async function factory (pkgName) {
           }
         },
         memDb: {
-          autoSaveDur: '1s'
+          persistenceDur: '1s'
         },
         applet: {
           confirmation: false

package/lib/collect-connections.js

@@ -31,21 +31,13 @@ async function collectConnections () {
   const { buildCollections } = this.app.bajo
   const { pullAt } = this.app.lib._
   const { filterIndex } = this.app.lib.aneka
-  const DoboConnection = await connectionFactory.call(this)
+  await connectionFactory.call(this)
 
   async function handler ({ item }) {
     const { has } = this.app.lib._
     if (!has(item, 'driver')) this.fatal('unknownDbDriver%s')
-    let driver
-    try {
-      driver = this.getDriver(item.driver, true)
-      if (!driver) throw new Error()
-    } catch (err) {
-      this.fatal('unknownDbDriver%s', item.driver)
-    }
-    await driver.sanitizeConnection(item)
-    const conn = new DoboConnection(this, item)
-    conn.driver = driver
+    const conn = new this.app.baseClass.DoboConnection(this, item)
+    await conn.initDriver(item.driver)
     return conn
   }
   const memIndexes = filterIndex(this.config.connections, current => current.driver === 'dobo:memory' || current.name === 'memory')

package/lib/collect-drivers.js

@@ -13,7 +13,7 @@ async function collectDrivers () {
   const { eachPlugins, runHook } = this.app.bajo
   const { importModule } = this.app.bajo
   const { camelCase, isFunction } = this.app.lib._
-  const DoboDriver = await driverFactory.call(this)
+  await driverFactory.call(this)
 
   this.log.trace('collecting%s', this.t('driver'))
   const me = this
@@ -24,7 +24,7 @@ async function collectDrivers () {
     if (!isFunction(factory)) this.fatal('invalidDriverClassFactory%s%s', this.ns, name)
     const Cls = await factory.call(this)
     const instance = new Cls(this, name)
-    if (!(instance instanceof DoboDriver)) this.fatal('invalidDriverClass%s%s', this.ns, name)
+    if (!(instance instanceof this.app.baseClass.DoboDriver)) this.fatal('invalidDriverClass%s%s', this.ns, name)
     me.drivers.push(instance)
     me.log.trace('- %s:%s', this.ns, name)
   }, { glob: 'driver/*.js', prefix: this.ns })

package/lib/collect-features.js

@@ -20,7 +20,7 @@ import featureFactory from './factory/feature.js'
  */
 async function collectFeature () {
   const { eachPlugins } = this.app.bajo
-  const DoboFeature = await featureFactory.call(this)
+  await featureFactory.call(this)
 
   this.log.trace('collecting%s', this.t('feature'))
   const me = this
@@ -31,7 +31,7 @@ async function collectFeature () {
     const name = camelCase(path.basename(file, '.js'))
     const handler = await importModule(file)
     if (!isFunction(handler)) this.fatal('invalidFeatureHandler%s%s', this.ns, name)
-    me.features.push(new DoboFeature(this, { name, handler }))
+    me.features.push(new this.app.baseClass.DoboFeature(this, { name, handler }))
     me.log.trace('- %s:%s', this.ns, name)
   }, { glob: 'feature/*.js', prefix: this.ns })
   this.log.debug('collected%s%d', this.t('feature'), this.features.length)

package/lib/collect-models.js

@@ -247,8 +247,6 @@ export async function sanitizeAll (model) {
 async function createSchema (item) {
   const { find, orderBy, get } = this.app.lib._
   const { mergeObjectsByKey, defaultsDeep, parseObject } = this.app.lib.aneka
-  if (item.file && !item.base) item.base = path.basename(item.file, path.extname(item.file))
-  item.attachment = item.attachment ?? true
   const feats = item.features ?? []
   const props = item.properties ?? []
   const indexes = item.indexes ?? []
@@ -258,21 +256,23 @@ async function createSchema (item) {
   item.hidden = item.hidden ?? []
   item.rules = item.rules ?? []
   item.buildLevel = item.buildLevel ?? 999
-  const conn = item.connection ?? 'default'
-  item.connection = null
   item.hooks = item.hooks ?? []
   item.disabled = item.disabled ?? []
   item.scanables = item.scanables ?? []
   if (item.disabled === 'all') item.disabled = ['find', 'get', 'create', 'update', 'remove']
   else if (item.disabled === 'readonly') item.disabled = ['create', 'update', 'remove']
-  // Is there any overwritten connection?
-  const newConn = find(this.connections, c => c.options.models.includes(item.name))
-  if (newConn) item.connection = newConn
-  else {
-    item.connection = this.getConnection(conn, true)
-    if (!item.connection && conn === 'default') item.connection = this.getConnection('memory')
+  const conn = item.connection ?? 'default'
+  if (!(conn instanceof this.app.baseClass.DoboConnection)) {
+    item.connection = null
+    // Is there any overwritten connection?
+    const newConn = find(this.connections, c => c.options.models.includes(item.name))
+    if (newConn) item.connection = newConn
+    else {
+      item.connection = this.getConnection(conn, true)
+      if (!item.connection && conn === 'default') item.connection = this.getConnection('memory')
+    }
+    if (!item.connection) this.fatal('unknownConn%s%s', conn, item.name)
   }
-  if (!item.connection) this.fatal('unknownConn%s%s', conn, item.name)
   // cache settings
   const defCache = defaultsDeep({}, item.connection.options.cache, get(this, 'app.bajoCache.config.default', this.config.default.cache))
   if (item.cache === false) item.cache = { ttlDur: 0 }
@@ -305,9 +305,9 @@ async function createSchema (item) {
  */
 async function collectModels () {
   const { eachPlugins } = this.app.bajo
-  const { orderBy, has } = this.app.lib._
+  const { orderBy, has, isFunction, omit } = this.app.lib._
   await actionFactory.call(this)
-  const DoboModel = await modelFactory.call(this)
+  await modelFactory.call(this)
 
   this.log.trace('collecting%s', this.t('model'))
   const me = this
@@ -325,8 +325,13 @@ async function collectModels () {
     item.name = item.name ?? defName
     me.log.trace('- %s', item.name)
     item.collName = item.collName ?? item.name
-    item.file = file
+    item.options = item.options ?? {}
+    item.options.attachment = item.options.attachment ?? true
+    item.options.persistence = item.options.persistence ?? true
+    item.options.file = file
+    item.options.base = item.options.base ?? path.basename(file, path.extname(file))
     item.ns = this.ns
+    if (isFunction(item.buildStart)) await item.buildStart.call(me, item)
     const schema = await createSchema.call(me, item)
     schemas.push(schema)
   }, { glob: 'model/*.*', prefix: this.ns })
@@ -337,11 +342,13 @@ async function collectModels () {
     const idProp = schema.properties.find(p => p.name === 'id')
     if (!this.constructor.idTypes.includes(idProp.type)) this.fatal('invalidIdType%s%s', schema.name, this.constructor.idTypes.join(', '))
     if (idProp.type === 'string' && !has(idProp, 'maxLength')) idProp.maxLength = 50
-    const model = new DoboModel(plugin, schema)
+    const model = new this.app.baseClass.DoboModel(plugin, omit(schema, ['beforeCreate', 'afterCreate']))
+    schema.model = model
     me.models.push(model)
   }
   // last sanitizing & checking
-  for (const model of me.models) {
+  for (const schema of schemas) {
+    const model = schema.model
     await sanitizeRef.call(this, model, me.models)
     for (const item of model.indexes) {
       for (const field of item.fields) {
@@ -353,7 +360,9 @@ async function collectModels () {
       const prop = model.properties.find(p => p.name === field)
       if (!prop || (prop && prop.virtual)) throw this.error('virtualFieldIn%s%s%s', field, 'scanable', model.name)
     }
+    if (isFunction(schema.buildEnd)) await schema.buildEnd.call(me, model)
   }
+  schemas = []
   this.log.debug('collected%s%d', this.t('model'), this.models.length)
 }
 

package/lib/factory/action.js

@@ -155,7 +155,6 @@ async function actionFactory () {
   }
 
   this.app.baseClass.DoboAction = DoboAction
-  return DoboAction
 }
 
 export default actionFactory

package/lib/factory/connection.js

@@ -28,15 +28,37 @@ async function connectionFactory () {
        * @type {string}
        */
       this.name = options.name
+      this.options = {
+        models: []
+      }
 
       /**
        * Options object from connection defined on ```dobo.config.connections```
        *
        * @type {Object}
        */
-      this.options = omit(options, ['name', 'driver'])
-      this.options.connName = options.name
-      this.options.models = this.options.models ?? []
+      if (options instanceof this.app.baseClass.DoboNullDriver) {
+        this.driver = options
+        this.options.connName = 'nulldriver'
+      } else {
+        this.options = omit(options, ['name', 'driver'])
+        this.options.connName = options.name
+        this.options.models = this.options.models ?? []
+      }
+    }
+
+    /**
+     * Init driver. Called automatically during connections collection
+     *
+     * @param {strin} name - Driver name
+     * @async
+     */
+    async initDriver (name) {
+      if (name instanceof this.app.baseClass.DoboDriver) this.driver = name
+      else {
+        this.driver = this.plugin.getDriver(name)
+        await this.driver.sanitizeConnection(this.options)
+      }
     }
 
     /**
@@ -48,6 +70,7 @@ async function connectionFactory () {
     async connect (noRebuild) {
       const client = await this.driver.connect(this, noRebuild)
       if (client) this.client = client
+      this.connected = true
     }
 
     dispose = async () => {
@@ -57,7 +80,6 @@ async function connectionFactory () {
   }
 
   this.app.baseClass.DoboConnection = DoboConnection
-  return DoboConnection
 }
 
 export default connectionFactory